diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-29 12:39:04 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-29 12:39:04 +1200 |
| commit | 51a0046d026d0e4273413e2e8c84ef9e26f0a4cf (patch) | |
| tree | 260134e338c1c7f2cee0c716d07a64c0b0ea79a0 /setup | |
| parent | 9ab536ca8c4e1ad850cb5fa08bbe99f14676b535 (diff) | |
| parent | 7644abe2e8aeb27de803b35bea772e2fe0a94c72 (diff) | |
| download | trackermap-server-51a0046d026d0e4273413e2e8c84ef9e26f0a4cf.tar.gz trackermap-server-51a0046d026d0e4273413e2e8c84ef9e26f0a4cf.tar.bz2 trackermap-server-51a0046d026d0e4273413e2e8c84ef9e26f0a4cf.zip | |
Merge branch master from github
Diffstat (limited to 'setup')
| -rwxr-xr-x | setup/package.sh | 1 | ||||
| -rw-r--r-- | setup/windows/traccar.iss | 1 |
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);
|