aboutsummaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-08-28 12:12:33 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-08-28 12:12:33 +1200
commit7644abe2e8aeb27de803b35bea772e2fe0a94c72 (patch)
treeff5d80b28dc35d6ef38ae726a4a679ec358781df /setup
parent09a99e1e3971612fe7effea976e0cd1e669f4320 (diff)
downloadtraccar-server-7644abe2e8aeb27de803b35bea772e2fe0a94c72.tar.gz
traccar-server-7644abe2e8aeb27de803b35bea772e2fe0a94c72.tar.bz2
traccar-server-7644abe2e8aeb27de803b35bea772e2fe0a94c72.zip
Set character encoding to UTF-8
Diffstat (limited to 'setup')
-rwxr-xr-xsetup/package.sh1
-rw-r--r--setup/windows/traccar.iss1
2 files changed, 2 insertions, 0 deletions
diff --git a/setup/package.sh b/setup/package.sh
index 45facba5a..5199e972c 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -120,6 +120,7 @@ package_unix () {
sed -i '/wrapper.java.classpath.1/i\wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf
sed -i '/wrapper.app.parameter.1/i\wrapper.app.parameter.2=../conf/traccar.xml' out/conf/wrapper.conf
+ sed -i 's/wrapper.java.additional.1=/wrapper.java.additional.1=-Dfile.encoding=UTF-8/g' out/conf/wrapper.conf
sed -i 's/<YourMainClass>/org.traccar.Main/g' out/conf/wrapper.conf
sed -i 's/@app.name@/traccar/g' out/conf/wrapper.conf
sed -i 's/@app.long.name@/traccar/g' out/conf/wrapper.conf
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 933b12b58..2c0dac5e6 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -65,6 +65,7 @@ begin
LoadStringFromFile(ExpandConstant(CurrentFileName), S);
Insert('wrapper.java.classpath.2=../tracker-server.jar' + #13#10, S, Pos('wrapper.java.classpath.1', S));
Insert(ExpandConstant('wrapper.app.parameter.2="{app}\conf\traccar.xml"') + #13#10, S, Pos('wrapper.app.parameter.1', S));
+ StringChangeEx(S, 'wrapper.java.additional.1=', 'wrapper.java.additional.1=-Dfile.encoding=UTF-8', true);
StringChangeEx(S, '<YourMainClass>', 'org.traccar.Main', true);
StringChangeEx(S, '@app.name@', 'Traccar', true);
StringChangeEx(S, '@app.long.name@', 'Traccar', true);