From 1432d04a7be8397becd5c88f9e1f075861acbfdc Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 17 Sep 2018 21:22:34 +1200
Subject: Update packaging scripts

---
 setup/traccar.iss | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

(limited to 'setup/traccar.iss')

diff --git a/setup/traccar.iss b/setup/traccar.iss
index 4ad473053..4deccf2d9 100644
--- a/setup/traccar.iss
+++ b/setup/traccar.iss
@@ -2,50 +2,18 @@
 AppName=Traccar
 AppVersion=4.0
 DefaultDirName={pf}\Traccar
-AlwaysRestart=yes
 OutputBaseFilename=traccar-setup
 ArchitecturesInstallIn64BitMode=x64
 
 [Dirs]
-Name: "{app}\conf"
 Name: "{app}\data"
-Name: "{app}\lib"
 Name: "{app}\logs"
-Name: "{app}\web"
-Name: "{app}\schema"
-Name: "{app}\templates"
 
 [Files]
 Source: "out\*"; DestDir: "{app}"; Flags: recursesubdirs
 
 [Run]
-Filename: "java.exe"; Parameters: "-jar ""{app}\tracker-server.jar"" --install .\conf\traccar.xml"; Flags: runhidden
+Filename: "{app}\jre\bin\java.exe"; Parameters: "-jar ""{app}\tracker-server.jar"" --install .\conf\traccar.xml"; Flags: runhidden
 
 [UninstallRun]
-Filename: "java.exe"; Parameters: "-jar ""{app}\tracker-server.jar"" --uninstall"; Flags: runhidden
-
-[Code]
-function GetLocalMachine(): Integer;
-begin
-  if IsWin64 then
-  begin
-    Result := HKLM64;
-  end
-  else
-  begin
-    Result := HKEY_LOCAL_MACHINE;
-  end;
-end;
-
-function InitializeSetup(): Boolean;
-begin
-  if RegKeyExists(GetLocalMachine(), 'SOFTWARE\JavaSoft') then
-  begin
-    Result := true;
-  end
-  else
-  begin
-    Result := false;
-    MsgBox('This application requires Java Runtime Environment version 7 or later. Please download and install the JRE and run this setup again. If you have Java installed and still get this error, you need to re-install it from offline installer (for more info see https://www.traccar.org/windows/).', mbCriticalError, MB_OK);
-  end;
-end;
+Filename: "{app}\jre\bin\java.exe"; Parameters: "-jar ""{app}\tracker-server.jar"" --uninstall"; Flags: runhidden
-- 
cgit v1.2.3