From 028f7bafb22be648a5630c4ca606815d6d0a8355 Mon Sep 17 00:00:00 2001
From: henrygd <hank@henrygd.me>
Date: Mon, 2 Feb 2026 14:30:08 -0500
Subject: [PATCH] add InstallMethod parameter to Windows install script

Allows users to explicitly choose Scoop or WinGet for installation
instead of relying on auto-detection. Useful when both package
managers are installed but the user prefers one over the other.
---
 supplemental/scripts/install-agent.ps1 | 35 ++++++++++++++++++++------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/supplemental/scripts/install-agent.ps1 b/supplemental/scripts/install-agent.ps1
index d7ed9b4f..d795b503 100644
--- a/supplemental/scripts/install-agent.ps1
+++ b/supplemental/scripts/install-agent.ps1
@@ -7,13 +7,15 @@ param (
     [int]$Port = 45876,
     [string]$AgentPath = "",
     [string]$NSSMPath = "",
-    [switch]$ConfigureFirewall
+    [switch]$ConfigureFirewall,
+    [ValidateSet("Auto", "Scoop", "WinGet")]
+    [string]$InstallMethod = "Auto"
 )
 
 # Check if required parameters are provided
 if ([string]::IsNullOrWhiteSpace($Key)) {
     Write-Host "ERROR: SSH Key is required." -ForegroundColor Red
-    Write-Host "Usage: .\install-agent.ps1 -Key 'your-ssh-key-here' [-Token 'your-token-here'] [-Url 'your-hub-url-here'] [-Port port-number] [-ConfigureFirewall]" -ForegroundColor Yellow
+    Write-Host "Usage: .\install-agent.ps1 -Key 'your-ssh-key-here' [-Token 'your-token-here'] [-Url 'your-hub-url-here'] [-Port port-number] [-InstallMethod Auto|Scoop|WinGet] [-ConfigureFirewall]" -ForegroundColor Yellow
     Write-Host "Note: Token and Url are optional for backwards compatibility with older hub versions." -ForegroundColor Yellow
     exit 1
 }
@@ -486,18 +488,34 @@ try {
             Write-Host "2. Install WinGet and run this script again" -ForegroundColor Yellow
             exit 1
         }
-        
-        if (Test-CommandExists "scoop") {
+
+        if ($InstallMethod -eq "Scoop") {
+            if (-not (Test-CommandExists "scoop")) {
+                throw "InstallMethod is set to Scoop, but Scoop is not available in PATH."
+            }
             Write-Host "Using Scoop for installation..."
             $AgentPath = Install-WithScoop -Key $Key -Port $Port
         }
-        elseif (Test-CommandExists "winget") {
+        elseif ($InstallMethod -eq "WinGet") {
+            if (-not (Test-CommandExists "winget")) {
+                throw "InstallMethod is set to WinGet, but WinGet is not available in PATH."
+            }
             Write-Host "Using WinGet for installation..."
             $AgentPath = Install-WithWinGet -Key $Key -Port $Port
         }
         else {
-            Write-Host "Neither Scoop nor WinGet is installed. Installing Scoop..."
-            $AgentPath = Install-WithScoop -Key $Key -Port $Port
+            if (Test-CommandExists "scoop") {
+                Write-Host "Using Scoop for installation..."
+                $AgentPath = Install-WithScoop -Key $Key -Port $Port
+            }
+            elseif (Test-CommandExists "winget") {
+                Write-Host "Using WinGet for installation..."
+                $AgentPath = Install-WithWinGet -Key $Key -Port $Port
+            }
+            else {
+                Write-Host "Neither Scoop nor WinGet is installed. Installing Scoop..."
+                $AgentPath = Install-WithScoop -Key $Key -Port $Port
+            }
         }
     }
 
@@ -561,7 +579,8 @@ try {
             "-Token", "`"$Token`"",
             "-Url", "`"$Url`"",
             "-Port", $Port,
-            "-AgentPath", "`"$AgentPath`""
+            "-AgentPath", "`"$AgentPath`"",
+            "-InstallMethod", $InstallMethod
         )
         
         # Add NSSMPath if we found it