Rearrange installation scripts

scripts/Windows/OS/Install.ps1

@@ -1,4 +1,8 @@
 . "$PSScriptRoot/Manage.ps1";
 
-$context = [Context]::new();
-Invoke-WindowsRestore $context;
+function Invoke-WindowsInstallation([Context] $context)
+{
+    . "$PSScriptRoot/../../../scripts/Windows/Scripts/Prerequisites.ps1";
+    Invoke-Upgrade $context;
+    Invoke-WindowsRestore $context;
+}

scripts/Windows/OS/Setup.ps1

@@ -1,25 +0,0 @@
-Import-Module PSWindowsUpdate;
-Import-Module ScheduledTasks;
-
-$installerPath = "$PSScriptRoot/Install.ps1";
-$setupPath = "$($MyInvocation.MyCommand.Path)";
-
-Install-WindowsUpdate -AcceptAll -IgnoreReboot;
-
-if ((Get-WindowsUpdate).Count -gt 0)
-{
-    $nextScript = "$setupPath";
-}
-else
-{
-    $nextScript = "$installerPath";
-}
-
-if ((Get-WURebootStatus).RebootRequired)
-{
-    New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\RunOnce" -Name "PortValhalla" -Value "pwsh `"$nextScript`"" -PropertyType ExpandString;
-}
-else
-{
-    . "$nextScript";
-}

scripts/Windows/OS/Upgrade.ps1

@@ -0,0 +1,20 @@
+function Invoke-Upgrade([Context] $context)
+{
+    $null = Import-Module PSWindowsUpdate;
+    $null = Install-WindowsUpdate -AcceptAll -IgnoreReboot;
+
+    if ((Get-WURebootStatus).RebootRequired)
+    {
+        $null = New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\RunOnce" -Name "PortValhalla" -Value "pwsh `"$($context.EntryPoint)`"" -PropertyType ExpandString;
+        exit;
+    }
+    elseif ((Get-WindowsUpdate).Count -gt 0)
+    {
+        $null = Invoke-Upgrade $context;
+        return;
+    }
+    else
+    {
+        return;
+    }
+}

scripts/Windows/Scripts/Context.ps1

@@ -1,4 +1,5 @@
 class Context {
+    [string]$EntryPoint;
     [string]$RootDir;
     [string]$BackupName;
     [string] BackupRoot() {