From a0deb0b84b4d369d598196433c14bda30d2bf428 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Thu, 8 Aug 2024 13:17:14 +0200
Subject: [PATCH] Reorder installation steps

---
 scripts/Windows/OS/Install.ps1 | 38 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 2ac32dc4..f9cc2c42 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -68,17 +68,30 @@ $null = New-Module {
                     continue;
                 }
 
+                if (-not (Test-Winget)) {
+                    . "$PSScriptRoot/../Software/winget/Manage.ps1";
+                    continue;
+                }
+
+                if (-not (& { wsl --status; $?; })) {
+                    wsl --install --no-launch;
+                    Restart-Intermediate;
+                    return;
+                }
+
+                if (-not (wsl --shell-type login type -t nix)) {
+                    ubuntu install --root;
+                    wsl -- sh `<`(curl -L https://nixos.org/nix/install`) --daemon --yes;
+                    wsl --shutdown;
+                    continue;
+                }
+
                 Invoke-Hook "Install-PSModules" -Fallback {
                     Install-Module -AcceptLicense -Force PSWindowsUpdate;
                     Install-Module -AcceptLicense -Force PSScriptAnalyzer;
                     . "$PSScriptRoot/../../Common/Software/PinnedItem/Manage.ps1";
                 };
 
-                if (-not (Test-Winget)) {
-                    . "$PSScriptRoot/../Software/winget/Manage.ps1";
-                    continue;
-                }
-
                 if (-not (Test-PSPackage Selenium.WebDriver)) {
                     Install-Module -AcceptLicense -Force NuGet;
                     Import-Module NuGet;
@@ -87,20 +100,7 @@ $null = New-Module {
                 }
 
                 Install-ChocoPackage selenium-gecko-driver firefox;
-
-                if (-not (& { wsl --status; $?; })) {
-                    wsl --install --no-launch;
-                    Restart-Intermediate;
-                    return;
-                } else {
-                    ubuntu install --root;
-                    wsl -- sh `<`(curl -L https://nixos.org/nix/install`) --daemon --yes;
-                    wsl --shutdown;
-                }
-
-                if (wsl --shell-type login type -t nix) {
-                    Set-Stage ([SetupStage]::Configure);
-                }
+                Set-Stage ([SetupStage]::Configure);
             } else {
                 $null = Import-Module PSWindowsUpdate;