aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-07-08 17:14:14 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-07-08 17:14:14 +1200
commit6c302a650cfb67506c51ca14d5e16bbf2709c8f4 (patch)
treeef6555a4430965170d3b20be71cd1f5c0ce6a52d
parentb368eda2a2673fceb304efd4a64f36ca7e5b7b9e (diff)
downloadtrackermap-server-6c302a650cfb67506c51ca14d5e16bbf2709c8f4.tar.gz
trackermap-server-6c302a650cfb67506c51ca14d5e16bbf2709c8f4.tar.bz2
trackermap-server-6c302a650cfb67506c51ca14d5e16bbf2709c8f4.zip
Split setup script again
-rwxr-xr-xsetup/package.sh17
-rwxr-xr-xsetup/setup.sh17
2 files changed, 19 insertions, 15 deletions
diff --git a/setup/package.sh b/setup/package.sh
index d9276731c..7bc556e9e 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -118,21 +118,8 @@ package_unix () {
find out -type f \( -name \*.sh -o -name \*.vm \) -print0 | xargs -0 dos2unix
copy_files
- makeself out traccar.run "traccar" "\
-if which java &>/dev/null ; \
-then \
-if [ \$(java -version 2>&1 | grep -i version | sed 's/.*version \"\(.*\)\.\(.*\)\..*\"/\1\2/; 1q') -lt 17 ] ; \
-then \
-echo 'Java 7 or higher required' ; \
-else \
-mkdir -p /opt/traccar ; \
-cp -r * /opt/traccar ; \
-chmod -R go+rX /opt/traccar ; \
-/opt/traccar/bin/installDaemon.sh ; \
-fi ; \
-else \
-echo 'Java runtime is required' ; \
-fi"
+ cp setup.sh out
+ makeself out traccar.run "traccar" ./setup.sh
zip -j traccar-linux-$VERSION.zip traccar.run README.txt
cp traccar-linux-$VERSION.zip traccar-macos-$VERSION.zip
diff --git a/setup/setup.sh b/setup/setup.sh
new file mode 100755
index 000000000..502c0397b
--- /dev/null
+++ b/setup/setup.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if which java &>/dev/null
+then
+ if [ $(java -version 2>&1 | grep -i version | sed 's/.*version \"\(.*\)\.\(.*\)\..*\"/\1\2/; 1q') -lt 17 ]
+ then
+ echo 'Java 7 or higher required'
+ else
+ mkdir -p /opt/traccar
+ cp -r * /opt/traccar
+ rm /opt/traccar/setup.sh
+ chmod -R go+rX /opt/traccar
+ /opt/traccar/bin/installDaemon.sh
+ fi
+else
+ echo 'Java runtime is required'
+fi