diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-04-24 20:59:09 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-04-24 20:59:09 +1200 |
| commit | e20db832cb9a362524ea5204b0b03e4e1bc7e4c6 (patch) | |
| tree | c045fad85c7ea6209dbc5dc245dcbedc6cb81d98 /setup/windows | |
| parent | 117b541201cf7522b9b615221a62ce238f234615 (diff) | |
| download | trackermap-server-e20db832cb9a362524ea5204b0b03e4e1bc7e4c6.tar.gz trackermap-server-e20db832cb9a362524ea5204b0b03e4e1bc7e4c6.tar.bz2 trackermap-server-e20db832cb9a362524ea5204b0b03e4e1bc7e4c6.zip | |
Use same name for config files
Diffstat (limited to 'setup/windows')
| -rw-r--r-- | setup/windows/traccar.cfg (renamed from setup/windows/windows.cfg) | 0 | ||||
| -rw-r--r-- | setup/windows/traccar.iss | 4 |
2 files changed, 2 insertions, 2 deletions
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);
|