fix installers #3

Author: Flaminel

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

@@ -187,11 +187,6 @@ jobs:
           # Create config directory in user's Application Support
           mkdir -p "$HOME/Library/Application Support/Cleanuparr"
           
-          # Create sample configuration if it doesn't exist
-          if [ ! -f "$HOME/Library/Application Support/Cleanuparr/cleanuparr.json" ]; then
-              cp "/Applications/Cleanuparr.app/Contents/Resources/cleanuparr.json" "$HOME/Library/Application Support/Cleanuparr/"
-          fi
-          
           # Set permissions
           chmod -R 755 "$HOME/Library/Application Support/Cleanuparr"
           

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

@@ -187,11 +187,6 @@ jobs:
           # Create config directory in user's Application Support
           mkdir -p "$HOME/Library/Application Support/Cleanuparr"
           
-          # Create sample configuration if it doesn't exist
-          if [ ! -f "$HOME/Library/Application Support/Cleanuparr/cleanuparr.json" ]; then
-              cp "/Applications/Cleanuparr.app/Contents/Resources/config/cleanuparr.json" "$HOME/Library/Application Support/Cleanuparr/"
-          fi
-          
           # Set permissions
           chmod -R 755 "$HOME/Library/Application Support/Cleanuparr"
           

code/backend/Cleanuparr.Api/Cleanuparr.Api.csproj

@@ -6,6 +6,8 @@
         <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <PublishReadyToRun>true</PublishReadyToRun>
+        <EnableMacOSCodeSign>false</EnableMacOSCodeSign>
     </PropertyGroup>
 
     <ItemGroup>

installers/windows/cleanuparr-installer.iss

@@ -42,7 +42,6 @@ Name: "installservice"; Description: "Install as Windows Service (Recommended)";
 [Files]
 Source: "dist\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "Logo\favicon.ico"; DestDir: "{app}"; Flags: ignoreversion
-; Note: Application will create its own configuration files
 
 [Dirs]
 Name: "{app}\config"; Permissions: everyone-full
@@ -53,18 +52,14 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\favicon.ico"; Tasks: desktopicon
 
 [Run]
-; For fresh installs only - create and start service
+; Create service only if it doesn't exist (fresh install)
 Filename: "{sys}\sc.exe"; Parameters: "create ""{#MyServiceName}"" binPath= ""\""{app}\{#MyAppExeName}\"""" DisplayName= ""{#MyAppName}"" start= auto"; Tasks: installservice; Flags: runhidden; Check: not ServiceExists('{#MyServiceName}')
 Filename: "{sys}\sc.exe"; Parameters: "description ""{#MyServiceName}"" ""Cleanuparr download management service"""; Tasks: installservice; Flags: runhidden; Check: not ServiceExists('{#MyServiceName}')
 
-; For updates - stop service if running, wait for complete shutdown, then restart
-Filename: "{sys}\sc.exe"; Parameters: "stop ""{#MyServiceName}"""; Flags: runhidden; Check: ServiceExists('{#MyServiceName}') and IsServiceRunning('{#MyServiceName}') and IsTaskSelected('installservice')
-Filename: "{sys}\sc.exe"; Parameters: "start ""{#MyServiceName}"""; Tasks: installservice; Flags: runhidden; Check: ServiceExists('{#MyServiceName}') and ServiceExistedBefore
+; Start service (both fresh install and update)
+Filename: "{sys}\sc.exe"; Parameters: "start ""{#MyServiceName}"""; Tasks: installservice; Flags: runhidden
 
-; For fresh installs - start the newly created service
-Filename: "{sys}\sc.exe"; Parameters: "start ""{#MyServiceName}"""; Tasks: installservice; Flags: runhidden; Check: not ServiceExistedBefore
-
-; Open web interface (only if service is selected)
+; Open web interface
 Filename: "http://localhost:11011"; Description: "Open Cleanuparr Web Interface"; Flags: postinstall shellexec nowait; Check: IsTaskSelected('installservice')
 
 ; Run directly (if not installed as service)
@@ -76,15 +71,6 @@ Filename: "{sys}\timeout.exe"; Parameters: "/t 5"; Flags: runhidden; Check: Serv
 Filename: "{sys}\sc.exe"; Parameters: "delete ""{#MyServiceName}"""; Flags: runhidden; Check: ServiceExists('{#MyServiceName}')
 
 [Code]
-var
-  ServiceExistedBefore: Boolean;
-
-procedure CreateConfigDirs;
-begin
-  // Create config directory - application will create its own config files
-  ForceDirectories(ExpandConstant('{app}\config'));
-end;
-
 function ServiceExists(ServiceName: string): Boolean;
 var
   ResultCode: Integer;
@@ -95,119 +81,90 @@ end;
 function IsServiceRunning(ServiceName: string): Boolean;
 var
   ResultCode: Integer;
-  Output: AnsiString;
-  OutputFile: string;
+  TempFile: string;
+  StatusOutput: AnsiString;
 begin
   Result := False;
-  OutputFile := ExpandConstant('{tmp}\service_status.txt');
+  TempFile := ExpandConstant('{tmp}\service_status.txt');
   
-  // Query service status and capture output
-  if Exec(ExpandConstant('{sys}\sc.exe'), 'query "' + ServiceName + '"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) and (ResultCode = 0) then
+  // Use PowerShell to get service status
+  if Exec(ExpandConstant('{sys}\WindowsPowerShell\v1.0\powershell.exe'), 
+          '-Command "try { (Get-Service -Name ''' + ServiceName + ''' -ErrorAction Stop).Status } catch { ''NotFound'' }" > "' + TempFile + '"', 
+          '', SW_HIDE, ewWaitUntilTerminated, ResultCode) and (ResultCode = 0) then
   begin
-    // Use PowerShell to get service status more reliably
-    if Exec(ExpandConstant('{sys}\WindowsPowerShell\v1.0\powershell.exe'), 
-            '-Command "& {(Get-Service -Name ''' + ServiceName + ''' -ErrorAction SilentlyContinue).Status}"', 
-            '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+    if LoadStringFromFile(TempFile, StatusOutput) then
     begin
-      // If we can't determine status precisely, assume it might be running to be safe
-      Result := True;
+      Result := (Pos('Running', StatusOutput) > 0);
     end;
+    DeleteFile(TempFile);
   end;
 end;
 
-function WaitForServiceStop(ServiceName: string): Boolean;
+function WaitForServiceStop(ServiceName: string; TimeoutSeconds: Integer): Boolean;
 var
   Counter: Integer;
-  ResultCode: Integer;
-  StatusOutput: AnsiString;
-  TempFile: string;
 begin
   Result := True;
   Counter := 0;
-  TempFile := ExpandConstant('{tmp}\service_check.txt');
   
-  // Wait up to 30 seconds for service to stop
-  while Counter < 30 do
+  while Counter < TimeoutSeconds do
   begin
-    // Check service status using PowerShell for more reliable output
-    if Exec(ExpandConstant('{sys}\WindowsPowerShell\v1.0\powershell.exe'), 
-            '-Command "& {try { $s = Get-Service -Name ''' + ServiceName + ''' -ErrorAction Stop; $s.Status } catch { ''NotFound'' }}" > "' + TempFile + '"', 
-            '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
-    begin
-      if LoadStringFromFile(TempFile, StatusOutput) then
-      begin
-        // If service is stopped or not found, we're good
-        if (Pos('Stopped', StatusOutput) > 0) or (Pos('NotFound', StatusOutput) > 0) then
-        begin
-          DeleteFile(TempFile);
-          Exit;
-        end;
-      end;
-    end;
-    
+    if not IsServiceRunning(ServiceName) then
+      Exit;
     Sleep(1000);
     Counter := Counter + 1;
   end;
   
-  // Cleanup temp file
-  DeleteFile(TempFile);
-  
-  // If we get here, service didn't stop in time
-  if Counter >= 30 then
-  begin
-    MsgBox('Warning: Service took longer than expected to stop. Installation will continue but the service may need to be restarted manually.', 
-           mbInformation, MB_OK);
-    Result := False;
-  end;
+  Result := False;
 end;
 
 function InitializeSetup(): Boolean;
 var
   ResultCode: Integer;
 begin
-  // Remember if service existed before installation
-  ServiceExistedBefore := ServiceExists('{#MyServiceName}');
+  Result := True;
   
-  // Only stop service if it exists and is running
-  if ServiceExistedBefore and IsServiceRunning('{#MyServiceName}') then
+  // If service exists and is running, stop it for the update
+  if ServiceExists('{#MyServiceName}') and IsServiceRunning('{#MyServiceName}') then
   begin
     if MsgBox('Cleanuparr service is currently running and needs to be stopped for the installation. Continue?', 
               mbConfirmation, MB_YESNO) = IDYES then
     begin
       Exec(ExpandConstant('{sys}\sc.exe'), 'stop "{#MyServiceName}"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
-      if not WaitForServiceStop('{#MyServiceName}') then
+      
+      if not WaitForServiceStop('{#MyServiceName}', 30) then
       begin
-        // Service didn't stop properly, but continue anyway
-        Log('Warning: Service did not stop cleanly, continuing with installation');
+        MsgBox('Warning: Service took longer than expected to stop. Installation will continue but you may need to restart the service manually.', 
+               mbInformation, MB_OK);
       end;
     end
     else
     begin
       Result := False;
-      Exit;
     end;
   end;
-  
-  Result := True;
 end;
 
 function InitializeUninstall(): Boolean;
 var
   ResultCode: Integer;
 begin
+  Result := True;
+  
   if ServiceExists('{#MyServiceName}') then
   begin
     if MsgBox('Cleanuparr service will be stopped and removed. Continue with uninstallation?', 
               mbConfirmation, MB_YESNO) = IDYES then
     begin
-      Exec(ExpandConstant('{sys}\sc.exe'), 'stop "{#MyServiceName}"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
-      WaitForServiceStop('{#MyServiceName}');
+      if IsServiceRunning('{#MyServiceName}') then
+      begin
+        Exec(ExpandConstant('{sys}\sc.exe'), 'stop "{#MyServiceName}"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
+        WaitForServiceStop('{#MyServiceName}', 30);
+      end;
     end
     else
     begin
       Result := False;
-      Exit;
     end;
   end;
-  Result := True;
 end;