aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-09 19:44:10 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-07-09 19:44:10 +1200
commita35705abc85b0f9854f8749c88e186c400c7f133 (patch)
tree27c752ecac128c61ba8e32a6a40b78bdd9e9263a
parent86bc790176832e0043a2f3bc03589008c09d01f4 (diff)
downloadtrackermap-server-a35705abc85b0f9854f8749c88e186c400c7f133.tar.gz
trackermap-server-a35705abc85b0f9854f8749c88e186c400c7f133.tar.bz2
trackermap-server-a35705abc85b0f9854f8749c88e186c400c7f133.zip
Fix another mac sed issue (fix #1043)v3.6
-rwxr-xr-xsetup/package.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/setup/package.sh b/setup/package.sh
index a265afb80..928a6e5b1 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -120,14 +120,17 @@ package_unix () {
sed -i.bak 's/@app.name@/traccar/g' out/bin/traccar
sed -i.bak 's/@app.long.name@/traccar/g' out/bin/traccar
- sed -i.bak '/wrapper.java.classpath.1/i\wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf
- sed -i.bak '/wrapper.app.parameter.1/i\wrapper.app.parameter.2=../conf/traccar.xml' out/conf/wrapper.conf
+ sed -i.bak '/wrapper.java.classpath.1/a\
+wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf
+ sed -i.bak '/wrapper.app.parameter.1/a\
+wrapper.app.parameter.2=../conf/traccar.xml' out/conf/wrapper.conf
sed -i.bak 's/wrapper.java.additional.1=/wrapper.java.additional.1=-Dfile.encoding=UTF-8/g' out/conf/wrapper.conf
sed -i.bak 's/<YourMainClass>/org.traccar.Main/g' out/conf/wrapper.conf
sed -i.bak 's/@app.name@/traccar/g' out/conf/wrapper.conf
sed -i.bak 's/@app.long.name@/traccar/g' out/conf/wrapper.conf
sed -i.bak 's/@app.description@/traccar/g' out/conf/wrapper.conf
- sed -i.bak 's/wrapper.logfile=..\/logs\/wrapper.log/wrapper.logfile=..\/logs\/wrapper.log.YYYYMMDD\nwrapper.logfile.rollmode=DATE/g' out/conf/wrapper.conf
+ sed -i.bak 's/wrapper.logfile=..\/logs\/wrapper.log/wrapper.logfile=..\/logs\/wrapper.log.YYYYMMDD\
+wrapper.logfile.rollmode=DATE/g' out/conf/wrapper.conf
rm out/bin/traccar.bak
rm out/conf/wrapper.conf.bak