From 88a1f80f2540886e427cab2452e038e902b6d054 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 8 Mar 2016 15:51:35 +1300
Subject: Update package and setup scripts

---
 setup/package.sh    |  1 -
 setup/unix/setup.sh | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'setup')

diff --git a/setup/package.sh b/setup/package.sh
index 8014836bb..fa5fbd277 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -15,7 +15,6 @@ fi
 VERSION=$1
 
 check_requirement () {
-  eval $1 &>/dev/null
   if ! eval $1 &>/dev/null
   then
     echo $2
diff --git a/setup/unix/setup.sh b/setup/unix/setup.sh
index 902139a1a..478966ea0 100755
--- a/setup/unix/setup.sh
+++ b/setup/unix/setup.sh
@@ -2,13 +2,18 @@
 
 UNIX_PATH="/opt/traccar"
 
-if [ $(java -version 2>&1 | grep -i version | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') -lt 17 ]
+if which java &>/dev/null
 then
-  echo "Please install Java version 7 or higher"
+  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 $UNIX_PATH
+    cp -rf * $UNIX_PATH
+    chmod -R go+rX $UNIX_PATH
+    $UNIX_PATH/bin/traccar install
+    rm $UNIX_PATH/setup.sh
+  fi
 else
-  mkdir -p $UNIX_PATH
-  cp -rf * $UNIX_PATH
-  chmod -R go+rX $UNIX_PATH
-  $UNIX_PATH/bin/traccar install
-  rm $UNIX_PATH/setup.sh
+  echo "Java runtime is required"
 fi
-- 
cgit v1.2.3