4 files changed, 32 insertions, 24 deletions
diff --git a/setup/package.sh b/setup/package.sh
index a7b58b599..928a6e5b1 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -94,7 +94,7 @@ package_windows () {
 
   wine app/ISCC.exe windows/traccar.iss
 
-  zip -j traccar-$1-$VERSION.zip windows/Output/setup.exe README.txt
+  zip -j traccar-$1-$VERSION.zip windows/Output/traccar-setup.exe README.txt
 
   rm -rf windows/Output/
   rm -rf tmp/
@@ -108,26 +108,32 @@ package_unix () {
   cp wrapper/lib/wrapper.jar out/lib
   cp wrapper/src/conf/wrapper.conf.in out/conf/wrapper.conf
 
-  sed -i 's/tail -1/tail -n 1/g' out/bin/traccar
+  sed -i.bak 's/tail -1/tail -n 1/g' out/bin/traccar
   chmod +x out/bin/traccar
 
   cp ../target/tracker-server.jar out
   cp ../target/lib/* out/lib
-cp ../schema/* out/schema
+  cp ../schema/* out/schema
   cp -r ../web/* out/web
   cp unix/traccar.xml out/conf
 
-  sed -i 's/@app.name@/traccar/g' out/bin/traccar
-  sed -i 's/@app.long.name@/traccar/g' out/bin/traccar
-
-  sed -i '/wrapper.java.classpath.1/i\wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf
-  sed -i '/wrapper.app.parameter.1/i\wrapper.app.parameter.2=../conf/traccar.xml' out/conf/wrapper.conf
-  sed -i 's/wrapper.java.additional.1=/wrapper.java.additional.1=-Dfile.encoding=UTF-8/g' out/conf/wrapper.conf
-  sed -i 's/<YourMainClass>/org.traccar.Main/g' out/conf/wrapper.conf
-  sed -i 's/@app.name@/traccar/g' out/conf/wrapper.conf
-  sed -i 's/@app.long.name@/traccar/g' out/conf/wrapper.conf
-  sed -i 's/@app.description@/traccar/g' out/conf/wrapper.conf
-  sed -i 's/wrapper.logfile=..\/logs\/wrapper.log/wrapper.logfile=..\/logs\/wrapper.log.YYYYMMDD\nwrapper.logfile.rollmode=DATE/g' out/conf/wrapper.conf
+  sed -i.bak 's/@app.name@/traccar/g' out/bin/traccar
+  sed -i.bak 's/@app.long.name@/traccar/g' out/bin/traccar
+
+  sed -i.bak '/wrapper.java.classpath.1/a\
+wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf
+  sed -i.bak '/wrapper.app.parameter.1/a\
+wrapper.app.parameter.2=../conf/traccar.xml' out/conf/wrapper.conf
+  sed -i.bak 's/wrapper.java.additional.1=/wrapper.java.additional.1=-Dfile.encoding=UTF-8/g' out/conf/wrapper.conf
+  sed -i.bak 's/<YourMainClass>/org.traccar.Main/g' out/conf/wrapper.conf
+  sed -i.bak 's/@app.name@/traccar/g' out/conf/wrapper.conf
+  sed -i.bak 's/@app.long.name@/traccar/g' out/conf/wrapper.conf
+  sed -i.bak 's/@app.description@/traccar/g' out/conf/wrapper.conf
+  sed -i.bak 's/wrapper.logfile=..\/logs\/wrapper.log/wrapper.logfile=..\/logs\/wrapper.log.YYYYMMDD\
+wrapper.logfile.rollmode=DATE/g' out/conf/wrapper.conf
+
+  rm out/bin/traccar.bak
+  rm out/conf/wrapper.conf.bak
 
   eval $2
 
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index cad96982e..767d53d8b 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -18,14 +18,10 @@
     <entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
 
     <entry key='event.enable'>true</entry>
-
     <entry key='event.suppressRepeated'>60</entry>
-
     <entry key='event.overspeedHandler'>true</entry>
     <entry key='event.globalSpeedLimit'>90</entry>
-
     <entry key='event.motionHandler'>true</entry>
-
     <entry key='event.geofenceHandler'>true</entry>
 
     <!-- DATABASE CONFIG -->
@@ -35,6 +31,8 @@
     <entry key='database.user'>sa</entry>
     <entry key='database.password'></entry>
 
+    <entry key='database.ignoreUnknown'>true</entry>
+
     <entry key='database.changelog'>/opt/traccar/schema/changelog-master.xml</entry>
     
     <entry key='database.selectServers'>
@@ -386,6 +384,8 @@
     <entry key='supermate.port'>5108</entry>
     <entry key='appello.port'>5109</entry>
     <entry key='idpl.port'>5110</entry>
+    <entry key='huasheng.port'>5111</entry>
+    <entry key='l100.port'>5112</entry>
     <entry key='granit.port'>5113</entry>
 
 </properties>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 56de5c1a6..f5d41c6b0 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,8 +1,9 @@
 [Setup]
 AppName=Traccar
-AppVersion=3.5
+AppVersion=3.6
 DefaultDirName={pf}\Traccar
 AlwaysRestart=yes
+OutputBaseFilename=traccar-setup
 
 [Dirs]
 Name: "{app}\bin"
@@ -11,6 +12,7 @@ Name: "{app}\data"
 Name: "{app}\lib"
 Name: "{app}\logs"
 Name: "{app}\web"
+Name: "{app}\schema"
 
 [Files]
 Source: "..\wrapper\bin\wrapper-windows-x86-32.exe"; DestDir: "{app}\bin"; DestName: "wrapper.exe"
@@ -23,7 +25,7 @@ Source: "..\wrapper\src\conf\wrapper.conf.in"; DestDir: "{app}\conf"; DestName:
 
 Source: "..\..\target\tracker-server.jar"; DestDir: "{app}"
 Source: "..\..\target\lib\*"; DestDir: "{app}\lib"
-Source: "..\..\database\*"; DestDir: "{app}\data"
+Source: "..\..\schema\*"; DestDir: "{app}\schema"
 Source: "..\..\web\*"; DestDir: "{app}\web"; Flags: recursesubdirs
 Source: "traccar.xml"; DestDir: "{app}\conf"; AfterInstall: ConfigureApplication
 
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index fcefd1daa..8499bda67 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -18,14 +18,10 @@
     <entry key='logger.file'>[LOG]</entry>
 
     <entry key='event.enable'>true</entry>
-
     <entry key='event.suppressRepeated'>60</entry>
-
     <entry key='event.overspeedHandler'>true</entry>
     <entry key='event.globalSpeedLimit'>90</entry>
-
     <entry key='event.motionHandler'>true</entry>
-
     <entry key='event.geofenceHandler'>true</entry>
 
     <!-- DATABASE CONFIG -->
@@ -35,6 +31,8 @@
     <entry key='database.user'>sa</entry>
     <entry key='database.password'></entry>
 
+    <entry key='database.ignoreUnknown'>true</entry>
+
     <entry key='database.changelog'>[CHANGELOG]</entry>
 
     <entry key='database.selectServers'>
@@ -386,6 +384,8 @@
     <entry key='supermate.port'>5108</entry>
     <entry key='appello.port'>5109</entry>
     <entry key='idpl.port'>5110</entry>
+    <entry key='huasheng.port'>5111</entry>
+    <entry key='l100.port'>5112</entry>
     <entry key='granit.port'>5113</entry>
 
 </properties>