diff --git a/Dashboard/Dashboard.iss b/Dashboard/Dashboard.iss index 046caf8..f066304 100644 --- a/Dashboard/Dashboard.iss +++ b/Dashboard/Dashboard.iss @@ -4,11 +4,11 @@ [Setup] AppId={{9D9EEE25-4D24-422D-98AF-2ADEDA4745ED}} AppName=GE Aerospace Dashboard -AppVersion=1.0 +AppVersion=1.1 AppPublisher=WJDT -AppPublisherURL=http://tsgwp00525.rd.ds.ge.com -AppSupportURL=http://tsgwp00525.rd.ds.ge.com -AppUpdatesURL=http://tsgwp00525.rd.ds.ge.com +AppPublisherURL=http://tsgwp00525.wjs.geaerospace.net +AppSupportURL=http://tsgwp00525.wjs.geaerospace.net +AppUpdatesURL=http://tsgwp00525.wjs.geaerospace.net DefaultDirName={autopf}\GE Aerospace Dashboard CreateAppDir=yes DisableDirPage=yes @@ -32,15 +32,28 @@ WelcomeLabel2=This will install the GE Aerospace Dashboard shortcut on your comp [Icons] ; Desktop shortcut (common - all users) -Name: "{commondesktop}\GE Aerospace Dashboard"; Filename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Parameters: "-kiosk https://tsgwp00525.rd.ds.ge.com/shopdb/shopfloor-dashboard/ --edge-kiosk-type=fullscreen"; IconFilename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Comment: "GE Aerospace Shopfloor Dashboard" +Name: "{commondesktop}\GE Aerospace Dashboard"; Filename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Parameters: "-kiosk https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor-dashboard/ --edge-kiosk-type=fullscreen"; IconFilename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Comment: "GE Aerospace Shopfloor Dashboard" ; Startup folder shortcut (common - launches on any user login) -Name: "{commonstartup}\GE Aerospace Dashboard"; Filename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Parameters: "-kiosk https://tsgwp00525.rd.ds.ge.com/shopdb/shopfloor-dashboard/ --edge-kiosk-type=fullscreen"; IconFilename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Comment: "GE Aerospace Shopfloor Dashboard" +Name: "{commonstartup}\GE Aerospace Dashboard"; Filename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Parameters: "-kiosk https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor-dashboard/ --edge-kiosk-type=fullscreen"; IconFilename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Comment: "GE Aerospace Shopfloor Dashboard" [Registry] ; Auto-start via Run key (backup to startup folder) -Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "GE Aerospace Dashboard"; ValueData: """{commonpf32}\Microsoft\Edge\Application\msedge.exe"" -kiosk https://tsgwp00525.rd.ds.ge.com/shopdb/shopfloor-dashboard/ --edge-kiosk-type=fullscreen"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "GE Aerospace Dashboard"; ValueData: """{commonpf32}\Microsoft\Edge\Application\msedge.exe"" -kiosk https://tsgwp00525.wjs.geaerospace.net/shopdb/shopfloor-dashboard/ --edge-kiosk-type=fullscreen"; Flags: uninsdeletevalue [UninstallDelete] Type: files; Name: "{commondesktop}\GE Aerospace Dashboard.lnk" Type: files; Name: "{commonstartup}\GE Aerospace Dashboard.lnk" + +[Code] +function PrepareToInstall(var NeedsRestart: Boolean): String; +var + ResultCode: Integer; +begin + Result := ''; + NeedsRestart := False; + // Kill any running Edge instances so shortcuts and registry can be updated cleanly + Exec('taskkill.exe', '/F /IM msedge.exe', '', SW_HIDE, ewWaitUntilTerminated, ResultCode); + // Brief pause to let processes fully exit + Sleep(1000); +end; diff --git a/LobbyDisplay/LobbyDisplay.iss b/LobbyDisplay/LobbyDisplay.iss index 2f4a022..7f32300 100644 --- a/LobbyDisplay/LobbyDisplay.iss +++ b/LobbyDisplay/LobbyDisplay.iss @@ -4,11 +4,11 @@ [Setup] AppId={{42FFB952-0B72-493F-8869-D957344CA305}} AppName=GE Aerospace Lobby Display -AppVersion=1.0 +AppVersion=1.1 AppPublisher=WJDT -AppPublisherURL=http://tsgwp00525.rd.ds.ge.com -AppSupportURL=http://tsgwp00525.rd.ds.ge.com -AppUpdatesURL=http://tsgwp00525.rd.ds.ge.com +AppPublisherURL=http://tsgwp00525.wjs.geaerospace.net +AppSupportURL=http://tsgwp00525.wjs.geaerospace.net +AppUpdatesURL=http://tsgwp00525.wjs.geaerospace.net DefaultDirName={autopf}\GE Aerospace Lobby Display CreateAppDir=yes DisableDirPage=yes @@ -32,15 +32,28 @@ WelcomeLabel2=This will install the GE Aerospace Lobby Display shortcut on your [Icons] ; Desktop shortcut (common - all users) -Name: "{commondesktop}\GE Aerospace Lobby Display"; Filename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Parameters: "-kiosk https://tsgwp00525.rd.ds.ge.com/shopdb/tv-dashboard/ --edge-kiosk-type=fullscreen"; IconFilename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Comment: "GE Aerospace TV Dashboard" +Name: "{commondesktop}\GE Aerospace Lobby Display"; Filename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Parameters: "-kiosk https://tsgwp00525.wjs.geaerospace.net/shopdb/tv-dashboard/ --edge-kiosk-type=fullscreen"; IconFilename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Comment: "GE Aerospace TV Dashboard" ; Startup folder shortcut (common - launches on any user login) -Name: "{commonstartup}\GE Aerospace Lobby Display"; Filename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Parameters: "-kiosk https://tsgwp00525.rd.ds.ge.com/shopdb/tv-dashboard/ --edge-kiosk-type=fullscreen"; IconFilename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Comment: "GE Aerospace TV Dashboard" +Name: "{commonstartup}\GE Aerospace Lobby Display"; Filename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Parameters: "-kiosk https://tsgwp00525.wjs.geaerospace.net/shopdb/tv-dashboard/ --edge-kiosk-type=fullscreen"; IconFilename: "{commonpf32}\Microsoft\Edge\Application\msedge.exe"; Comment: "GE Aerospace TV Dashboard" [Registry] ; Auto-start via Run key (backup to startup folder) -Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "GE Aerospace Lobby Display"; ValueData: """{commonpf32}\Microsoft\Edge\Application\msedge.exe"" -kiosk https://tsgwp00525.rd.ds.ge.com/shopdb/tv-dashboard/ --edge-kiosk-type=fullscreen"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "GE Aerospace Lobby Display"; ValueData: """{commonpf32}\Microsoft\Edge\Application\msedge.exe"" -kiosk https://tsgwp00525.wjs.geaerospace.net/shopdb/tv-dashboard/ --edge-kiosk-type=fullscreen"; Flags: uninsdeletevalue [UninstallDelete] Type: files; Name: "{commondesktop}\GE Aerospace Lobby Display.lnk" Type: files; Name: "{commonstartup}\GE Aerospace Lobby Display.lnk" + +[Code] +function PrepareToInstall(var NeedsRestart: Boolean): String; +var + ResultCode: Integer; +begin + Result := ''; + NeedsRestart := False; + // Kill any running Edge instances so shortcuts and registry can be updated cleanly + Exec('taskkill.exe', '/F /IM msedge.exe', '', SW_HIDE, ewWaitUntilTerminated, ResultCode); + // Brief pause to let processes fully exit + Sleep(1000); +end;