aboutsummaryrefslogtreecommitdiff
path: root/setup/package.sh
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-04-24 20:59:09 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2013-04-24 20:59:09 +1200
commite20db832cb9a362524ea5204b0b03e4e1bc7e4c6 (patch)
treec045fad85c7ea6209dbc5dc245dcbedc6cb81d98 /setup/package.sh
parent117b541201cf7522b9b615221a62ce238f234615 (diff)
downloadtrackermap-server-e20db832cb9a362524ea5204b0b03e4e1bc7e4c6.tar.gz
trackermap-server-e20db832cb9a362524ea5204b0b03e4e1bc7e4c6.tar.bz2
trackermap-server-e20db832cb9a362524ea5204b0b03e4e1bc7e4c6.zip
Use same name for config files
Diffstat (limited to 'setup/package.sh')
-rwxr-xr-xsetup/package.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/setup/package.sh b/setup/package.sh
index c3c67b7a8..a2a7e916c 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -96,13 +96,13 @@ cp wrapper/src/conf/wrapper.conf.in out/conf/wrapper.conf
cp ../target/tracker-server.jar out
cp ../target/lib/* out/lib
cp traccar-web.war out
-cp linux/linux.cfg out/conf
+cp linux/traccar.cfg out/conf
sed -i 's/@app.name@/traccar/g' out/bin/traccar
sed -i 's/@app.long.name@/traccar/g' out/bin/traccar
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=$app/conf/linux.cfg" out/conf/wrapper.conf
+sed -i "/wrapper.app.parameter.1/i\wrapper.app.parameter.2=$app/conf/traccar.cfg" 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
@@ -142,9 +142,7 @@ zip -j traccar-linux-arm.zip traccar.run linux/README.txt
rm out/conf/linux.cfg
rm out/lib/libwrapper.so
-cp macosx/macosx.cfg out/conf
-
-sed -i "s/linux.cfg/macosx.cfg/g" out/conf/wrapper.conf
+cp macosx/traccar.cfg out/conf
cp wrapper/bin/wrapper-macosx-universal-64 out/bin/wrapper
cp wrapper/lib/libwrapper-macosx-universal-64.jnilib out/lib/libwrapper.jnilib