From e20db832cb9a362524ea5204b0b03e4e1bc7e4c6 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 24 Apr 2013 20:59:09 +1200 Subject: Use same name for config files --- setup/windows/traccar.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup/windows/traccar.iss') 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, '', 'org.traccar.Main', true); StringChangeEx(S, '@app.name@', 'Traccar', true); StringChangeEx(S, '@app.long.name@', 'Traccar', true); -- cgit v1.2.3