Merge remote-tracking branch 'refs/remotes/tananaev/master'

5 files changed, 26 insertions, 14 deletions

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
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index 5eb64e7b0..c43fd25fd 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -24,7 +24,7 @@
     <entry key='database.user'>sa</entry>
     <entry key='database.password'></entry>
 
-    <entry key='database.changelog'>/opt/traccar/data/db.changelog-master.xml</entry>
+    <entry key='database.changelog'>/opt/traccar/data/changelog-master.xml</entry>
 
     <entry key='database.selectServers'>
         SELECT * FROM server;
@@ -210,7 +210,7 @@
     <entry key='eelink.port'>5064</entry>
     <entry key='box.port'>5065</entry>
     <entry key='freedom.port'>5066</entry>
-    <entry key='telik.port'>5067</entry>
+    <entry key='telic.port'>5067</entry>
     <entry key='trackbox.port'>5068</entry>
     <entry key='visiontek.port'>5069</entry>
     <entry key='orion.port'>5070</entry>
@@ -222,7 +222,7 @@
     <entry key='xt013.port'>5076</entry>
     <entry key='autofon.port'>5077</entry>
     <entry key='gosafe.port'>5078</entry>
-    <entry key='autofon45.port'>5079</entry>
+    <entry key='tt8850.port'>5079</entry>
     <entry key='bce.port'>5080</entry>
     <entry key='xirgo.port'>5081</entry>
     <entry key='calamp.port'>5082</entry>
@@ -244,5 +244,9 @@
     <entry key='thinkrace.port'>5098</entry>
     <entry key='pathaway.port'>5099</entry>
     <entry key='arnavi.port'>5100</entry>
+    <entry key='nvs.port'>5101</entry>
+    <entry key='kenji.port'>5102</entry>
+    <entry key='astra.port'>5103</entry>
+    <entry key='homtecs.port'>5104</entry>
 
 </properties>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 298c27200..891cc47c3 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -83,6 +83,6 @@ begin
   StringChangeEx(S, '[WEB]', ExpandConstant('{app}\web'), true);

   StringChangeEx(S, '[LOG]', ExpandConstant('{app}\logs\tracker-server.log'), true);

   StringChangeEx(S, '[DATABASE]', ExpandConstant('{app}\data\database'), true);

-  StringChangeEx(S, '[CHANGELOG]', ExpandConstant('{app}\data\db.changelog-master.xml'), true);

+  StringChangeEx(S, '[CHANGELOG]', ExpandConstant('{app}\data\changelog-master.xml'), true);

   SaveStringToFile(ExpandConstant(CurrentFileName), S, false);

 end;

diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index c1e675254..40b6fe20e 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -210,7 +210,7 @@
     <entry key='eelink.port'>5064</entry>

     <entry key='box.port'>5065</entry>

     <entry key='freedom.port'>5066</entry>

-    <entry key='telik.port'>5067</entry>

+    <entry key='telic.port'>5067</entry>

     <entry key='trackbox.port'>5068</entry>

     <entry key='visiontek.port'>5069</entry>

     <entry key='orion.port'>5070</entry>

@@ -222,7 +222,7 @@
     <entry key='xt013.port'>5076</entry>

     <entry key='autofon.port'>5077</entry>

     <entry key='gosafe.port'>5078</entry>

-    <entry key='autofon45.port'>5079</entry>

+    <entry key='tt8850.port'>5079</entry>

     <entry key='bce.port'>5080</entry>

     <entry key='xirgo.port'>5081</entry>

     <entry key='calamp.port'>5082</entry>

@@ -244,5 +244,9 @@
     <entry key='thinkrace.port'>5098</entry>

     <entry key='pathaway.port'>5099</entry>

     <entry key='arnavi.port'>5100</entry>

+    <entry key='nvs.port'>5101</entry>

+    <entry key='kenji.port'>5102</entry>

+    <entry key='astra.port'>5103</entry>

+    <entry key='homtecs.port'>5104</entry>

 

 </properties>