Skip to content

Commit 37cd50b

Browse files
committed
fix installers #2
1 parent ad17f2e commit 37cd50b

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/build-macos-arm-installer.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ jobs:
103103
/p:DebugSymbols=false \
104104
/p:EnableCompressionInSingleFile=false \
105105
/p:IncludeNativeLibrariesForSelfExtract=true \
106-
/p:UseAppHost=true
106+
/p:UseAppHost=true \
107+
/p:EnableMacOSCodeSign=false
107108
108109
- name: Verify architecture
109110
run: |

.github/workflows/build-macos-intel-installer.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ jobs:
103103
/p:DebugSymbols=false \
104104
/p:EnableCompressionInSingleFile=false \
105105
/p:IncludeNativeLibrariesForSelfExtract=true \
106-
/p:UseAppHost=true
106+
/p:UseAppHost=true \
107+
/p:EnableMacOSCodeSign=false
107108
108109
- name: Verify architecture
109110
run: |

installers/windows/cleanuparr-installer.iss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ Filename: "{sys}\sc.exe"; Parameters: "description ""{#MyServiceName}"" ""Cleanu
5959

6060
; For updates - stop service if running, wait for complete shutdown, then restart
6161
Filename: "{sys}\sc.exe"; Parameters: "stop ""{#MyServiceName}"""; Flags: runhidden; Check: ServiceExists('{#MyServiceName}') and IsServiceRunning('{#MyServiceName}') and IsTaskSelected('installservice')
62-
Filename: "{sys}\sc.exe"; Parameters: "start ""{#MyServiceName}"""; Tasks: installservice; Flags: runhidden; Check: ServiceExists('{#MyServiceName}') and WasServiceExisting
62+
Filename: "{sys}\sc.exe"; Parameters: "start ""{#MyServiceName}"""; Tasks: installservice; Flags: runhidden; Check: ServiceExists('{#MyServiceName}') and ServiceExistedBefore
6363

6464
; For fresh installs - start the newly created service
65-
Filename: "{sys}\sc.exe"; Parameters: "start ""{#MyServiceName}"""; Tasks: installservice; Flags: runhidden; Check: not WasServiceExisting
65+
Filename: "{sys}\sc.exe"; Parameters: "start ""{#MyServiceName}"""; Tasks: installservice; Flags: runhidden; Check: not ServiceExistedBefore
6666

6767
; Open web interface (only if service is selected)
6868
Filename: "http://localhost:11011"; Description: "Open Cleanuparr Web Interface"; Flags: postinstall shellexec nowait; Check: IsTaskSelected('installservice')
@@ -77,7 +77,7 @@ Filename: "{sys}\sc.exe"; Parameters: "delete ""{#MyServiceName}"""; Flags: runh
7777

7878
[Code]
7979
var
80-
WasServiceExisting: Boolean;
80+
ServiceExistedBefore: Boolean;
8181
8282
procedure CreateConfigDirs;
8383
begin
@@ -166,10 +166,10 @@ var
166166
ResultCode: Integer;
167167
begin
168168
// Remember if service existed before installation
169-
WasServiceExisting := ServiceExists('{#MyServiceName}');
169+
ServiceExistedBefore := ServiceExists('{#MyServiceName}');
170170
171171
// Only stop service if it exists and is running
172-
if WasServiceExisting and IsServiceRunning('{#MyServiceName}') then
172+
if ServiceExistedBefore and IsServiceRunning('{#MyServiceName}') then
173173
begin
174174
if MsgBox('Cleanuparr service is currently running and needs to be stopped for the installation. Continue?',
175175
mbConfirmation, MB_YESNO) = IDYES then

0 commit comments

Comments
 (0)