flip Get-SupportedArchitecture conditions to reduce nesting

ScoopInstaller · Oct 17, 2023 · 892832f · 892832f
1 parent a269210
commit 892832f
Showing 1 changed file with 22 additions and 24 deletions.
diff --git a/lib/manifest.ps1 b/lib/manifest.ps1
@@ -112,32 +112,30 @@ function arch_specific($prop, $manifest, $architecture) {
 }
 
 function Get-SupportedArchitecture($manifest, $architecture) {
-    if (!$manifest.architecture.$architecture) {
-        if ($architecture -eq 'arm64') {
-            # Windows 10 enables existing unmodified x86 apps to run on Arm devices.
-            # Windows 11 adds the ability to run unmodified x64 Windows apps on Arm devices!
-            # Ref: https://learn.microsoft.com/en-us/windows/arm/overview
-            $architecture = if ($WindowsBuild -ge 22000) {
-                # Windows 11
-                '64bit'
-            } else {
-                # Windows 10
-                '32bit'
-            }
-        } elseif ($architecture[-3] -eq '-') {
-            $success = $false
-            for ($i = $architecture[-1] - [byte][char]'0'; $i -gt 1; --$i) {
-                $testArch = "64bit-v$i"
-                if ($manifest.architecture.$testArch) {
-                    $success = $true
-                    break
-                }
+    if ($manifest.architecture.$architecture -and ![String]::IsNullOrEmpty((arch_specific 'url' $manifest $architecture))) {
+        return $architecture
+    }
+    if ($architecture -eq 'arm64') {
+        # Windows 10 enables existing unmodified x86 apps to run on Arm devices.
+        # Windows 11 adds the ability to run unmodified x64 Windows apps on Arm devices!
+        # Ref: https://learn.microsoft.com/en-us/windows/arm/overview
+        $architecture = if ($WindowsBuild -ge 22000) {
+            # Windows 11
+            '64bit'
+        } else {
+            # Windows 10
+            '32bit'
+        }
+    } elseif ($architecture[-3] -eq '-') {
+        $success = $false
+        for ($i = $architecture[-1] - [byte][char]'0'; $i -gt 1; --$i) {
+            $testArch = "64bit-v$i"
+            if ($manifest.architecture.$testArch) {
+                $success = $true
+                break
             }
-            $architecture = if ($success) { $testArch } else { '64bit' }
         }
-    }
-    if (![String]::IsNullOrEmpty((arch_specific 'url' $manifest $architecture))) {
-        return $architecture
+        $architecture = if ($success) { $testArch } else { '64bit' }
     }
 }