diff options
| author | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-11 22:16:25 +0100 |
|---|---|---|
| committer | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-11 22:16:25 +0100 |
| commit | 4606737cc07b736f9c8f98ae680b928c94c082c8 (patch) | |
| tree | bdd29b24a16403b1e8a3d7cd4325391063b34b8a /setup/unix | |
| parent | 3ced99384b1967f5cde9abdf30c1c0184a5ae3f6 (diff) | |
| parent | ab5d21e16ac44957e04da0f06daf148af95e96be (diff) | |
| download | traccar-server-4606737cc07b736f9c8f98ae680b928c94c082c8.tar.gz traccar-server-4606737cc07b736f9c8f98ae680b928c94c082c8.tar.bz2 traccar-server-4606737cc07b736f9c8f98ae680b928c94c082c8.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'setup/unix')
| -rwxr-xr-x | setup/unix/setup.sh | 19 | ||||
| -rw-r--r-- | setup/unix/traccar.xml | 10 |
2 files changed, 19 insertions, 10 deletions
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> |