WIP

Icinga · Aug 26, 2022 · bb2d97c · bb2d97c
1 parent b1dc837
commit bb2d97c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/icinga-powershell-framework.psm1 b/icinga-powershell-framework.psm1
@@ -290,7 +290,7 @@ function Invoke-IcingaCommand()
     # Ensure we set the path to another folder to prevent locking the Framework Root Folder
     Set-Location (Get-IcingaForWindowsRootPath);
 
-    $IcingaShellState = powershell.exe -NoExit -Command {
+    powershell.exe -NoExit -Command {
         $Script          = $args[0];
         $RootPath        = $args[1];
         $Version         = $args[2];
@@ -314,9 +314,6 @@ function Invoke-IcingaCommand()
         if ($Shell -eq $FALSE -And [string]::IsNullOrEmpty($Script)) {
             Install-Icinga;
 
-            # Return the current variables
-            Write-Output $Global:Icinga;
-
             exit $LASTEXITCODE;
         }
 
@@ -341,7 +338,9 @@ function Invoke-IcingaCommand()
     }
 
     # In case we applied updates to the Framework while inside the IMC -> reopen it
-    if ($null -ne $IcingaShellState -And $IcingaShellState.ContainsKey('InstallWizard') -And $IcingaShellState.InstallWizard.Updating) {
+    if (Test-IcingaForWindowsManagementConsoleUpdating) {
+        Set-IcingaForWindowsManagementConsoleUpdating -Completed;
+
         # Use the same arguments again to open the IMC
         $IMCReopenArguments = @{
             'ScriptBlock'   = $ScriptBlock;

diff --git a/lib/core/installer/Install-Icinga.psm1 b/lib/core/installer/Install-Icinga.psm1
@@ -40,7 +40,6 @@ function Install-Icinga()
                 'HeaderPrint'            = $FALSE;
                 'JumpToSummary'          = $FALSE;
                 'Closing'                = $FALSE;
-                'Updating'               = $FALSE;
             }
         );
     } else {

diff --git a/lib/core/installer/tools/SetUpdatingIMC.psm1 b/lib/core/installer/tools/SetUpdatingIMC.psm1
@@ -4,18 +4,12 @@ function Set-IcingaForWindowsManagementConsoleUpdating()
         [switch]$Completed = $FALSE
     );
 
-    if ($null -eq $Global:Icinga) {
-        return;
-    }
-
-    if ($Global:Icinga.ContainsKey('InstallWizard') -eq $FALSE) {
-        return;
-    }
+    Set-IcingaForWindowsManagementConsoleClosing;
 
-    if ($Global:Icinga.InstallWizard.ContainsKey('Updating') -eq $FALSE) {
-        return;
+    $UpdateFile = Join-Path -Path (Get-IcingaCacheDir) -ChildPath 'framework.update';
+    if ($Completed) {
+        Remove-ItemSecure -Path $UpdateFile -Force -Retries 5 | Out-Null;
+    } else {
+        New-Item -Path $UpdateFile -ItemType File -Force | Out-Null;
     }
-
-    Set-IcingaForWindowsManagementConsoleClosing;
-    $global:Icinga.InstallWizard.Updating = (-Not ([bool]$Completed));
 }
diff --git a/lib/core/installer/tools/TestUpdatingIMC.psm1 b/lib/core/installer/tools/TestUpdatingIMC.psm1
@@ -1,16 +1,6 @@
 function Test-IcingaForWindowsManagementConsoleUpdating()
 {
-    if ($null -eq $Global:Icinga) {
-        return $FALSE;
-    }
+    $UpdateFile = Join-Path -Path (Get-IcingaCacheDir) -ChildPath 'framework.update';
 
-    if ($Global:Icinga.ContainsKey('InstallWizard') -eq $FALSE) {
-        return $FALSE;
-    }
-
-    if ($Global:Icinga.InstallWizard.ContainsKey('Updating') -eq $FALSE) {
-        return $FALSE;
-    }
-
-    return $global:Icinga.InstallWizard.Updating;
+    return (Test-Path -Path $UpdateFile);
 }