diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
| commit | 7310ee5f15729ea8517bfb6b0890a46da1217610 (patch) | |
| tree | 44504738f127708420179a7dbbe2942cb67d0849 /setup/package.sh | |
| parent | 8e8da7019aab023ae255d0ed6d16b94d303fd468 (diff) | |
| parent | 0a6faa86c4b634fa3a94633506c4422623e36f1e (diff) | |
| download | trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.gz trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.bz2 trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.zip | |
Merge Java 7 update (fix #1273)
Diffstat (limited to 'setup/package.sh')
| -rwxr-xr-x | setup/package.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setup/package.sh b/setup/package.sh index b695993ea..6b91dd316 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -141,7 +141,7 @@ sed -i 's/wrapper.logfile=..\/logs\/wrapper.log/wrapper.logfile=..\/logs\/wrappe cp wrapper/bin/wrapper-linux-x86-32 out/bin/wrapper cp wrapper/lib/libwrapper-linux-x86-32.so out/lib/libwrapper.so -makeself out traccar.run "traccar" "mkdir $app; cp -rf * $app; $app/bin/traccar install" +makeself out traccar.run "traccar" "if [ $(java -version 2>&1 | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') -lt 17 ]; then echo "Please install Java version 7 or higher"; else mkdir $app; cp -rf * $app; $app/bin/traccar install; fi" zip -j traccar-linux-32-$1.zip traccar.run linux/README.txt # linux 64 @@ -149,7 +149,7 @@ zip -j traccar-linux-32-$1.zip traccar.run linux/README.txt cp wrapper/bin/wrapper-linux-x86-64 out/bin/wrapper cp wrapper/lib/libwrapper-linux-x86-64.so out/lib/libwrapper.so -makeself out traccar.run "traccar" "mkdir $app; cp -rf * $app; $app/bin/traccar install" +makeself out traccar.run "traccar" "if [ $(java -version 2>&1 | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') -lt 17 ]; then echo "Please install Java version 7 or higher"; else mkdir $app; cp -rf * $app; $app/bin/traccar install; fi" zip -j traccar-linux-64-$1.zip traccar.run linux/README.txt # linux arm @@ -162,7 +162,7 @@ cp wrapper/bin/wrapper-linux-armhf-32 out/bin/ cp wrapper/lib/libwrapper-linux-armel-32.so out/lib/ cp wrapper/lib/libwrapper-linux-armhf-32.so out/lib/ -makeself out traccar.run "traccar" "mkdir $app; cp -rf * $app; if [ -z "`readelf -A /proc/self/exe | grep Tag_ABI_VFP_args`" ]; then mv $app/bin/wrapper-linux-armel-32 $app/bin/wrapper; mv $app/lib/libwrapper-linux-armel-32.so $app/lib/libwrapper.so; else mv $app/bin/wrapper-linux-armhf-32 $app/bin/wrapper; mv $app/lib/libwrapper-linux-armhf-32.so $app/lib/libwrapper.so; fi; $app/bin/traccar install" +makeself out traccar.run "traccar" "if [ $(java -version 2>&1 | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') -lt 17 ]; then echo "Please install Java version 7 or higher"; else mkdir $app; cp -rf * $app; if [ -z "`readelf -A /proc/self/exe | grep Tag_ABI_VFP_args`" ]; then mv $app/bin/wrapper-linux-armel-32 $app/bin/wrapper; mv $app/lib/libwrapper-linux-armel-32.so $app/lib/libwrapper.so; else mv $app/bin/wrapper-linux-armhf-32 $app/bin/wrapper; mv $app/lib/libwrapper-linux-armhf-32.so $app/lib/libwrapper.so; fi; $app/bin/traccar install; fi" zip -j traccar-linux-arm-$1.zip traccar.run linux/README.txt # MACOSX PACKAGE |