Use same name for config files

5 files changed, 5 insertions, 7 deletions

diff --git a/setup/linux/linux.cfg b/setup/linux/traccar.cfg
index 00831c08e..00831c08e 100644
--- a/setup/linux/linux.cfg
+++ b/setup/linux/traccar.cfg
diff --git a/setup/macosx/macosx.cfg b/setup/macosx/traccar.cfg
index 00831c08e..00831c08e 100644
--- a/setup/macosx/macosx.cfg
+++ b/setup/macosx/traccar.cfg
diff --git a/setup/package.sh b/setup/package.sh
index c3c67b7a8..a2a7e916c 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -96,13 +96,13 @@ cp wrapper/src/conf/wrapper.conf.in out/conf/wrapper.conf
 cp ../target/tracker-server.jar out
 cp ../target/lib/* out/lib
 cp traccar-web.war out
-cp linux/linux.cfg out/conf
+cp linux/traccar.cfg 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=$app/conf/linux.cfg" out/conf/wrapper.conf
+sed -i "/wrapper.app.parameter.1/i\wrapper.app.parameter.2=$app/conf/traccar.cfg" 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
@@ -142,9 +142,7 @@ zip -j traccar-linux-arm.zip traccar.run linux/README.txt
 rm out/conf/linux.cfg
 rm out/lib/libwrapper.so
 
-cp macosx/macosx.cfg out/conf
-
-sed -i "s/linux.cfg/macosx.cfg/g" out/conf/wrapper.conf
+cp macosx/traccar.cfg out/conf
 
 cp wrapper/bin/wrapper-macosx-universal-64 out/bin/wrapper
 cp wrapper/lib/libwrapper-macosx-universal-64.jnilib out/lib/libwrapper.jnilib
diff --git a/setup/windows/windows.cfg b/setup/windows/traccar.cfg
index d8cacc1df..d8cacc1df 100644
--- a/setup/windows/windows.cfg
+++ b/setup/windows/traccar.cfg
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 50e30ba26..a8ceef253 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -23,7 +23,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: "..\traccar-web.war"; DestDir: "{app}"

-Source: "windows.cfg"; DestDir: "{app}\conf"; AfterInstall: ConfigureApplication

+Source: "traccar.cfg"; DestDir: "{app}\conf"; AfterInstall: ConfigureApplication

 

 [Run]

 Filename: "{app}\bin\InstallTraccar-NT.bat"

@@ -51,7 +51,7 @@ var
 begin

   LoadStringFromFile(ExpandConstant(CurrentFileName), S);

   Insert('wrapper.java.classpath.2=../tracker-server.jar' + #13#10, S, Pos('wrapper.java.classpath.1', S));

-  Insert(ExpandConstant('wrapper.app.parameter.2="{app}\conf\windows.cfg"') + #13#10, S, Pos('wrapper.app.parameter.1', S));

+  Insert(ExpandConstant('wrapper.app.parameter.2="{app}\conf\traccar.cfg"') + #13#10, S, Pos('wrapper.app.parameter.1', S));

   StringChangeEx(S, '<YourMainClass>', 'org.traccar.Main', true);

   StringChangeEx(S, '@app.name@', 'Traccar', true);

   StringChangeEx(S, '@app.long.name@', 'Traccar', true);