From cedcc3b845416b3215422530ef7026f0103fe82b Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:16:23 -0500
Subject: [PATCH 1/9] Update InstallHuntress.powershellv2.ps1

---
 Powershell/InstallHuntress.powershellv2.ps1 | 168 ++++++++++----------
 1 file changed, 80 insertions(+), 88 deletions(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 52265a9..85f9b84 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) 2025 Huntress Labs, Inc.
+ Copyright (c) 2025 Huntress Labs, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -14,7 +14,7 @@
 # OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Authors: Alan Bishop, Sharon Martin, John Ferrell, Dave Kleinatland, Cameron Granger
+# Authors: Alan Bishop, Sharon Martin, John Ferrell, Dave Kleinatland, Evan Shewchuk
 
 
 # The Huntress installer needs an Account Key and an Organization Key (a user specified name or description) which is used to affiliate an Agent with a
@@ -72,7 +72,7 @@ $estimatedSpaceNeeded = 200111222
 ##############################################################################
 
 # These are used by the Huntress support team when troubleshooting.
-$ScriptVersion = "Version 2, major revision 8, 2025 Oct 13"
+$ScriptVersion = "Version 2, major revision 8, 2025 Dec 22"
 $ScriptType = "PowerShell"
 
 # variables used throughout this script
@@ -82,7 +82,6 @@ $InstallerName              = "HuntressInstaller.exe"
 $InstallerPath              = Join-Path $Env:TMP $InstallerName
 $HuntressKeyPath            = "HKLM:\SOFTWARE\Huntress Labs\Huntress"
 $HuntressRegKey             = "HKLM:\SOFTWARE\Huntress Labs"
-$ScriptFailed               = "Script Failed!"
 $SupportMessage             = "Please send the error message to support@huntress.com"
 $HuntressAgentServiceName   = "HuntressAgent"
 $HuntressUpdaterServiceName = "HuntressUpdater"
@@ -187,33 +186,18 @@ function Test-Parameters {
 
     # Ensure we have an account key (hard coded or passed params) and that it's in the correct form
     if ($AccountKey -eq "__ACCOUNT_KEY__") {
-        $err = "AccountKey not set! Suggest using the -acctkey flag followed by your account key (you can find it in the Downloads section of your Huntress portal)."
-        LogMessage $err
-        throw $ScriptFailed + " " + $err
-        exit 1
+        copyLogAndExit -error "AccountKey not set! Suggest using the -acctkey flag followed by your account key (you can find it in the Downloads section of your Huntress portal)."
     } elseif ($AccountKey.length -ne 32) {
-        $err = "Invalid AccountKey specified (incorrect length)! Suggest double checking the key was copy/pasted in its entirety. Length = $($AccountKey.length)   expected value = 32"
-        LogMessage $err
-        throw $ScriptFailed + " " + $err
-        exit 1
+        copyLogAndExit -error "Invalid AccountKey specified (incorrect length)! Suggest double checking the key was copy/pasted in its entirety. Length = $($AccountKey.length)   expected value = 32"
     } elseif (($AccountKey -match '[^a-zA-Z0-9]')) {
-        $err = "Invalid AccountKey specified (invalid characters found)! Suggest double checking the key was copy/pasted fully"
-        LogMessage $err
-        throw $ScriptFailed + " " + $err
-        exit 1
+        copyLogAndExit -error "Invalid AccountKey specified (invalid characters found)! Suggest double checking the key was copy/pasted fully"
     }
 
     # Ensure we have an organization key (hard coded or passed params).
     if ($OrganizationKey -eq "__ORGANIZATION_KEY__") {
-        $err = "OrganizationKey not specified! This is a user defined identifier set by you (usually your customer's organization name)"
-        LogMessage $err
-        throw $ScriptFailed + " " + $err
-        exit 1
+        copyLogAndExit -error "OrganizationKey not specified! This is a user defined identifier set by you (usually your customer's organization name)"
     } elseif ($OrganizationKey.length -lt 1) {
-        $err = "Invalid OrganizationKey specified (length should be > 0)!"
-        LogMessage $err
-        throw $ScriptFailed + " " + $err
-        exit 1
+        copyLogAndExit -error "Invalid OrganizationKey specified (length should be > 0)!"
     }
     LogMessage "Parameters verified."
 }
@@ -280,12 +264,20 @@ function Confirm-ServiceRunning ($service) {
 function StopHuntressServices {
     LogMessage "Stopping Huntress services..."
     if (Confirm-ServiceExists($HuntressAgentServiceName)) {
-        Stop-Service -Name "$HuntressAgentServiceName"
+        try {
+            Stop-Service -Name "$HuntressAgentServiceName" -ErrorAction SilentlyContinue
+        } catch {
+             LogMessage "Unable to stop HuntressAgent, possible Tamper Protection interference."
+        }
     } else {
         LogMessage "$($HuntressAgentServiceName) not found, nothing to stop"
     }
     if (Confirm-ServiceExists($HuntressUpdaterServiceName)) {
-        Stop-Service -Name "$HuntressUpdaterServiceName"
+        try {
+            Stop-Service -Name "$HuntressUpdaterServiceName" -ErrorAction SilentlyContinue
+        } catch {
+            LogMessage "Unable to stop HuntressUpdater, possible Tamper Protection interference."
+        }
     } else {
         LogMessage "$($HuntressUpdaterServiceName) not found, nothing to stop"
     }
@@ -297,12 +289,7 @@ function verifyInstaller ($file) {
     try {
         $varChain.Build((Get-AuthenticodeSignature -FilePath "$file").SignerCertificate) | out-null
     } catch [System.Management.Automation.MethodInvocationException] {
-        $err = ( "ERROR: '$file' did not contain a valid digital certificate. " +
-                 "Something may have corrupted/modified the file during the download process. " +
-                 "Suggest trying again, contact support@huntress.com if it fails >2 times")
-        LogMessage $err
-        LogMessage $SupportMessage
-        throw $ScriptFailed + " " + $err + " " + $SupportMessage
+        copyLogAndExit -error "ERROR: '$file' did not contain a valid digital certificate, something may have corrupted the file. Try again and contact Support if the 2nd attempt fails"
     }
 }
 
@@ -337,11 +324,7 @@ function Get-Installer {
             # Rather than check for 'Tls12', we force-set TLS 1.2 and catch the error if it's truly unsupported.
             [Net.ServicePointManager]::SecurityProtocol = [Enum]::ToObject([Net.SecurityProtocolType], 3072)
         } catch {
-            $msg = $_.Exception.Message
-            $err = "ERROR: Unable to use a secure version of TLS. Please verify Hotfix KB3140245 is installed."
-            LogMessage $msg
-            LogMessage $err
-            throw $ScriptFailed + " " + $msg + " " + $err
+            copyLogAndExit -error "ERROR: Unable to use a secure version of TLS. Please verify Hotfix KB3140245 is installed. Error: ($_.Exception.Message)"
         }
     }
 
@@ -361,9 +344,7 @@ function Get-Installer {
             $WebClient.DownloadFile($DownloadURL, $InstallerPath)
             break
         } catch {
-            $msg = $_.Exception.Message
-            $err = "WARNING: Failed to download the Huntress Installer ($attempt/$attempts), retrying in $delay seconds."
-            LogMessage $msg
+            $err = "WARNING: Failed to download the Huntress Installer ($attempt/$attempts), retrying in $delay seconds. Error: $_.Exception.Message"
             LogMessage $err
             Start-Sleep -Seconds $delay
         }
@@ -371,9 +352,7 @@ function Get-Installer {
 
     # Ensure the file downloaded correctly, if not, throw error
     if ( ! (Test-Path $InstallerPath) ) {
-        $err = "ERROR: Failed to download the Huntress Installer. Try accessing $($DownloadURL) from the host where the download failed. Please contact support@huntress.io if the problem persists."
-        LogMessage $err
-        throw $ScriptFailed + " " + $err
+        copyLogAndExit -error "ERROR: Failed to download the Huntress Installer. Try accessing $($DownloadURL) from the host where the download failed. Please contact support@huntress.io if the problem persists."
     }
 
     $msg = "Installer downloaded to '$InstallerPath'..."
@@ -385,13 +364,12 @@ function Install-Huntress ($OrganizationKey) {
     # check that the installer downloaded and wasn't quarantined
     LogMessage "Checking for installer '$InstallerPath'..."
     if ( ! (Test-Path $InstallerPath) ) {
-        $err = "ERROR: The installer was unexpectedly removed from $InstallerPath"
-        $msg = ($err + "`n"+
+        $err = ("ERROR: The installer was unexpectedly removed from $InstallerPath `n"+
             "A security product may have quarantined the installer. Please check " +
             "your logs. If the issue continues to occur, please send the log to the Huntress " +
             "Team for help at support@huntresslabs.com")
-        LogMessage $msg
-        throw $ScriptFailed + " " + $err + " " + $SupportMessage
+        LogMessage $err
+        copyLogAndExit -error $err
     }
 
     # verify the installer's integrity
@@ -410,10 +388,7 @@ function Install-Huntress ($OrganizationKey) {
         $process | Wait-Process -Timeout $timeout -ErrorAction Stop
     } catch {
         $process | Stop-Process -Force
-        $err = "ERROR: Installer failed to complete in $timeout seconds. Possible interference from a security product?"
-        LogMessage $err
-        LogMessage $SupportMessage
-        throw $ScriptFailed + " " + $err + " " + $SupportMessage
+        copyLogAndExit -error "ERROR: Installer failed to complete in $timeout seconds. Possible interference from a security product?"
     }
 }
 
@@ -464,10 +439,7 @@ function Test-Installation {
     # Ensure the critical files were created.
     foreach ( $file in ($HuntressAgentPath, $HuntressUpdaterPath, $hUpdaterPath) ) {
         if ( ! (Test-Path $file) ) {
-            $err = "ERROR: $file did not exist. Check your AV/security software quarantine"
-            LogMessage $err
-            LogMessage $SupportMessage
-            throw $ScriptFailed + " " + $err + " " + $SupportMessage
+            copyLogAndExit -error "ERROR: $file did not exist. Check your AV/security software quarantine"
         }
         LogMessage "'$file' is present."
     }
@@ -492,8 +464,7 @@ function Test-Installation {
                     LogMessage "New install detected. It may take 24 hours for Huntress EDR (Rio) to install!"
                 }
             } else {
-                LogMessage "$($svc) service is missing! $($SupportMessage)"
-                throw "$($ScriptFailed) $($svc) service is missing! + $($SupportMessage)"
+                copyLogAndExit -error "$($svc) service is missing! + $($SupportMessage)"
             }
         }
         # check if the service is running, attempt to restart if not (only for base agent).
@@ -504,7 +475,7 @@ function Test-Installation {
                 LogMessage "ERROR: The $($svc) service is not running. Attempting to restart"
                 Start-Service $svc
                 if (! (Confirm-ServiceRunning($svc))) {
-                    throw "$($ScriptFailed) ERROR: restart of service $($svc) failed. $($SupportMessage)"
+                    copyLogAndExit -error "ERROR: restart of service $($svc) failed."
                 }
             } else {
                 LogMessage "'$svc' is running."
@@ -519,20 +490,14 @@ function Test-Installation {
     } else {
         # Ensure the Huntress registry key is present.
         if ( ! (Test-Path $HuntressKeyPath) ) {
-            $err = "ERROR: The registry key '$HuntressKeyPath' did not exist. You may need to reinstall with the -reregister flag"
-            LogMessage $err
-            LogMessage $SupportMessage
-            throw $ScriptFailed + " " + $err + " " + $SupportMessage
+            copyLogAndExit -error "ERROR: The registry key '$HuntressKeyPath' did not exist. You may need to reinstall with the -reregister flag"
         }
 
         # Ensure the Huntress registry values are present.
         $HuntressKeyObject = Get-ItemProperty $HuntressKeyPath
         foreach ( $value in ($AgentIdKeyValueName, $OrganizationKeyValueName, $TagsValueName) ) {
             If ( ! (Get-Member -inputobject $HuntressKeyObject -name $value -Membertype Properties) ) {
-                $err = "ERROR: The registry value $value did not exist within $HuntressKeyPath. You may need to reinstall with the -reregister flag"
-                LogMessage $err
-                LogMessage $SupportMessage
-                throw $ScriptFailed + " " + $err + " " + $SupportMessage
+                copyLogAndExit -error "ERROR: The registry value $value did not exist within $HuntressKeyPath. You may need to reinstall with the -reregister flag"
             }
         }
     }
@@ -542,10 +507,7 @@ function Test-Installation {
         LogMessage "WARNING: Can't verify agent registration due to 32bit PowerShell on 64bit host."
     } else {
         If ($HuntressKeyObject.$AgentIdKeyValueName -eq 0) {
-            $err = ("ERROR: The agent did not register. Check the log (%ProgramFiles%\Huntress\HuntressAgent.log) for errors.")
-            LogMessage $err
-            LogMessage $SupportMessage
-            throw $ScriptFailed + " " + $err + " " + $SupportMessage
+            copyLogAndExit -error "ERROR: The agent did not register. Check the log (%ProgramFiles%\Huntress\HuntressAgent.log) for errors. Missing $($HuntressKeyObject.$AgentIdKeyValueName)"
         }
         LogMessage "Agent registered."
     }
@@ -649,8 +611,7 @@ function runProcess ($process, $flags, $name){
         }
 
         $err = "ERROR: $($name) running as '$($process) $($flags)' failed to complete in $timeout seconds, full error message: '$($msg).'"
-        LogMessage $err
-        copyLogAndExit
+        copyLogAndExit -error $err
     }
 }
 
@@ -727,7 +688,7 @@ function uninstallHuntress {
     # if Huntress services still exist, then delete
     $services = @("HuntressRio", "HuntressAgent", "HuntressUpdater", "Huntmon")
     foreach ($service in $services) {
-        if ( $service ) {
+        if (Get-Service -name $service -ErrorAction SilentlyContinue) {
             LogMessage "Service $($service) detected post uninstall, attempting to remove"
             c:\Windows\System32\sc.exe STOP $service
             c:\Windows\System32\sc.exe DELETE $service
@@ -937,28 +898,62 @@ function logInfo {
     if ( $areURLsAvailable) {
         LogMessage "Network Connectivity verified!"
     } else {
-        copyLogAndExit
+        copyLogAndExit -error "ERROR: Network connectivity problem detected!"
     }
 
+    # Search both 64-bit and 32-bit uninstall registry paths for the required C++ library (version 12+ recommended)
+    $installedApps = (Get-ItemProperty 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*', 'HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*' )
+    $count = 0
+    foreach ( $app in $installedApps) {
+        try {
+            if ( $app.DisplayName -like "*vc++*") {
+                LogMessage "Name: $($app.DisplayName)  Version: $($app.DisplayVersion)"
+                count++
+            }
+        } catch {}
+    }
+    if ( $count -eq 0 ) {
+        LogMessage "Warning: Visual C++ library not found! You may have issues with Huntress running." +
+                   " Highly recommend installing C++ and trying the deploy again: https://www.microsoft.com/en-us/download/details.aspx?id=48145"
+    }
 }
 
-# DebugLog contains useful info not found in surveys, so copy to Huntress folder for higher visibility with future troubleshooting AB
-# In the past we copied to the users temp folder, difficult to find on machines with lots of profiles. Solved this by always placing the log in the normal Huntress folder.
+# This function copies the Huntress DebugLog to a more permanent location as it's incredibly helpful for troubleshooting.
+# Exits with a code 0 if $error wasn't passed, otherwise throws the error contained in the $error string
 function copyLogAndExit {
+    param (
+        [string]$error="0"
+    )
+
+    # log the error message first
+    if ($error -ne "0") {
+        LogMessage "WARNING: Script errors detected, operation may not have completed! $error `n$SupportMessage"
+    }
+
+    # sleep to ensure file operations have completed
     Start-Sleep 1
     $agentPath = getAgentPath
     $logLocation = Join-Path $agentPath "HuntressPoShInstaller.log"
 
-    # If this is an unistall, we'll leave the log in the C:\temp dir otherwise,
-    # we'll copy the log to the huntress directory
+    # If this is an unistall, we'll leave the log in the C:\temp dir, otherwise copy the log to the huntress directory
     if (!$uninstall){
         if (!(Test-Path -path $agentPath)) {New-Item $agentPath -Type Directory}
-        Copy-Item -Path $DebugLog -Destination $logLocation -Force
-        Write-Output "'$($DebugLog)' copied to '$logLocation'."
+        try {
+	    Copy-Item -Path $DebugLog -Destination $logLocation -Force -ErrorAction SilentlyContinue
+	    Write-Output "'$($DebugLog)' copied to '$logLocation'."
+	} catch {
+	    Write-Output "Unable to copy Installer log, possible Tamper Protection interference. Look in \Windows\temp\ for HuntressPoShInstaller.log"
+	}
     }
 
-    Write-Output "Script complete"
-    exit 0
+    # if no error was passed, exit gracefully, otherwise throw an error and exit
+    if ($error -eq "0") {
+         Write-Output "Script complete!"
+         exit 0
+    } else {
+        Write-Output "WARNING: Script errors detected, operation may not have completed! Error: [$error]"
+        throw "$error"
+    }
 }
 
 # Sometimes previous installs can be stuck with services in the Disabled state, this function attempts to set the state to Automatic.
@@ -1081,7 +1076,7 @@ function main () {
         LogMessage "powershell -executionpolicy bypass -f ./InstallHuntress.powershellv2.ps1 [-acctkey <account_key>] [-orgkey <organization_key>] [-tags <tags>] [-reregister] [-reinstall] [-uninstall] `n"
         LogMessage "Example:"
         LogMessage 'powershell -executionpolicy bypass -f ./InstallHuntress.powershellv2.ps1 -acctkey "0b8a694b2eb7b642069" -orgkey "Buzzword Company Name" -tags "production,US West" '
-        copyLogAndExit
+        copyLogAndExit -error "No flags or account key found! Exiting."
     }
 
 
@@ -1124,8 +1119,7 @@ function main () {
             $assetCount = (Get-ChildItem -Path $agentPath -File | Measure-Object).count
             # to avoid issues with a single file blocking installs, only exit script if multiple files are found and script not run with -reregister or -reinstall
             if ($assetCount -gt 1) {
-              LogMessage "The Huntress Agent is already installed in $agentPath. Exiting with no changes. Suggest using -reregister or -reinstall flags. Asset count = $assetCount"
-              copyLogAndExit
+              copyLogAndExit -error "The Huntress Agent is already installed in $agentPath. Exiting with no changes. Suggest using -reregister or -reinstall flags. Asset count = $assetCount"
             }
         }
     }
@@ -1142,9 +1136,7 @@ try {
     main
     Write-InstallScriptInfo
 } catch {
-    $ErrorMessage = $_.Exception.Message
-    LogMessage $ErrorMessage
-    copyLogAndExit
+    copyLogAndExit -error $_.Exception.Message
 }
 
 LogMessage "Script Complete"

From 3688ebaeaf3bc3304d3f2ed392c88a349cf77156 Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:57:17 -0500
Subject: [PATCH 2/9] Codacy fixes

---
 Powershell/InstallHuntress.powershellv2.ps1 | 70 +++++++++++----------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 85f9b84..31a21bd 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -1,4 +1,4 @@
- Copyright (c) 2025 Huntress Labs, Inc.
+# Copyright (c) 2025 Huntress Labs, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -186,18 +186,18 @@ function Test-Parameters {
 
     # Ensure we have an account key (hard coded or passed params) and that it's in the correct form
     if ($AccountKey -eq "__ACCOUNT_KEY__") {
-        copyLogAndExit -error "AccountKey not set! Suggest using the -acctkey flag followed by your account key (you can find it in the Downloads section of your Huntress portal)."
+        copyLogAndExit -throwError "AccountKey not set! Suggest using the -acctkey flag followed by your account key (you can find it in the Downloads section of your Huntress portal)."
     } elseif ($AccountKey.length -ne 32) {
-        copyLogAndExit -error "Invalid AccountKey specified (incorrect length)! Suggest double checking the key was copy/pasted in its entirety. Length = $($AccountKey.length)   expected value = 32"
+        copyLogAndExit -throwError "Invalid AccountKey specified (incorrect length)! Suggest double checking the key was copy/pasted in its entirety. Length = $($AccountKey.length)   expected value = 32"
     } elseif (($AccountKey -match '[^a-zA-Z0-9]')) {
-        copyLogAndExit -error "Invalid AccountKey specified (invalid characters found)! Suggest double checking the key was copy/pasted fully"
+        copyLogAndExit -throwError "Invalid AccountKey specified (invalid characters found)! Suggest double checking the key was copy/pasted fully"
     }
 
     # Ensure we have an organization key (hard coded or passed params).
     if ($OrganizationKey -eq "__ORGANIZATION_KEY__") {
-        copyLogAndExit -error "OrganizationKey not specified! This is a user defined identifier set by you (usually your customer's organization name)"
+        copyLogAndExit -throwError "OrganizationKey not specified! This is a user defined identifier set by you (usually your customer's organization name)"
     } elseif ($OrganizationKey.length -lt 1) {
-        copyLogAndExit -error "Invalid OrganizationKey specified (length should be > 0)!"
+        copyLogAndExit -throwError "Invalid OrganizationKey specified (length should be > 0)!"
     }
     LogMessage "Parameters verified."
 }
@@ -289,7 +289,7 @@ function verifyInstaller ($file) {
     try {
         $varChain.Build((Get-AuthenticodeSignature -FilePath "$file").SignerCertificate) | out-null
     } catch [System.Management.Automation.MethodInvocationException] {
-        copyLogAndExit -error "ERROR: '$file' did not contain a valid digital certificate, something may have corrupted the file. Try again and contact Support if the 2nd attempt fails"
+        copyLogAndExit -throwError "ERROR: '$file' did not contain a valid digital certificate, something may have corrupted the file. Try again and contact Support if the 2nd attempt fails"
     }
 }
 
@@ -324,7 +324,7 @@ function Get-Installer {
             # Rather than check for 'Tls12', we force-set TLS 1.2 and catch the error if it's truly unsupported.
             [Net.ServicePointManager]::SecurityProtocol = [Enum]::ToObject([Net.SecurityProtocolType], 3072)
         } catch {
-            copyLogAndExit -error "ERROR: Unable to use a secure version of TLS. Please verify Hotfix KB3140245 is installed. Error: ($_.Exception.Message)"
+            copyLogAndExit -throwError "ERROR: Unable to use a secure version of TLS. Please verify Hotfix KB3140245 is installed. Error: ($_.Exception.Message)"
         }
     }
 
@@ -352,7 +352,7 @@ function Get-Installer {
 
     # Ensure the file downloaded correctly, if not, throw error
     if ( ! (Test-Path $InstallerPath) ) {
-        copyLogAndExit -error "ERROR: Failed to download the Huntress Installer. Try accessing $($DownloadURL) from the host where the download failed. Please contact support@huntress.io if the problem persists."
+        copyLogAndExit -throwError "ERROR: Failed to download the Huntress Installer. Try accessing $($DownloadURL) from the host where the download failed. Please contact support@huntress.io if the problem persists."
     }
 
     $msg = "Installer downloaded to '$InstallerPath'..."
@@ -369,7 +369,7 @@ function Install-Huntress ($OrganizationKey) {
             "your logs. If the issue continues to occur, please send the log to the Huntress " +
             "Team for help at support@huntresslabs.com")
         LogMessage $err
-        copyLogAndExit -error $err
+        copyLogAndExit -throwError $err
     }
 
     # verify the installer's integrity
@@ -388,7 +388,7 @@ function Install-Huntress ($OrganizationKey) {
         $process | Wait-Process -Timeout $timeout -ErrorAction Stop
     } catch {
         $process | Stop-Process -Force
-        copyLogAndExit -error "ERROR: Installer failed to complete in $timeout seconds. Possible interference from a security product?"
+        copyLogAndExit -throwError "ERROR: Installer failed to complete in $timeout seconds. Possible interference from a security product?"
     }
 }
 
@@ -439,7 +439,7 @@ function Test-Installation {
     # Ensure the critical files were created.
     foreach ( $file in ($HuntressAgentPath, $HuntressUpdaterPath, $hUpdaterPath) ) {
         if ( ! (Test-Path $file) ) {
-            copyLogAndExit -error "ERROR: $file did not exist. Check your AV/security software quarantine"
+            copyLogAndExit -throwError "ERROR: $file did not exist. Check your AV/security software quarantine"
         }
         LogMessage "'$file' is present."
     }
@@ -464,7 +464,7 @@ function Test-Installation {
                     LogMessage "New install detected. It may take 24 hours for Huntress EDR (Rio) to install!"
                 }
             } else {
-                copyLogAndExit -error "$($svc) service is missing! + $($SupportMessage)"
+                copyLogAndExit -throwError "$($svc) service is missing! + $($SupportMessage)"
             }
         }
         # check if the service is running, attempt to restart if not (only for base agent).
@@ -475,7 +475,7 @@ function Test-Installation {
                 LogMessage "ERROR: The $($svc) service is not running. Attempting to restart"
                 Start-Service $svc
                 if (! (Confirm-ServiceRunning($svc))) {
-                    copyLogAndExit -error "ERROR: restart of service $($svc) failed."
+                    copyLogAndExit -throwError "ERROR: restart of service $($svc) failed."
                 }
             } else {
                 LogMessage "'$svc' is running."
@@ -490,14 +490,14 @@ function Test-Installation {
     } else {
         # Ensure the Huntress registry key is present.
         if ( ! (Test-Path $HuntressKeyPath) ) {
-            copyLogAndExit -error "ERROR: The registry key '$HuntressKeyPath' did not exist. You may need to reinstall with the -reregister flag"
+            copyLogAndExit -throwError "ERROR: The registry key '$HuntressKeyPath' did not exist. You may need to reinstall with the -reregister flag"
         }
 
         # Ensure the Huntress registry values are present.
         $HuntressKeyObject = Get-ItemProperty $HuntressKeyPath
         foreach ( $value in ($AgentIdKeyValueName, $OrganizationKeyValueName, $TagsValueName) ) {
             If ( ! (Get-Member -inputobject $HuntressKeyObject -name $value -Membertype Properties) ) {
-                copyLogAndExit -error "ERROR: The registry value $value did not exist within $HuntressKeyPath. You may need to reinstall with the -reregister flag"
+                copyLogAndExit -throwError "ERROR: The registry value $value did not exist within $HuntressKeyPath. You may need to reinstall with the -reregister flag"
             }
         }
     }
@@ -507,7 +507,7 @@ function Test-Installation {
         LogMessage "WARNING: Can't verify agent registration due to 32bit PowerShell on 64bit host."
     } else {
         If ($HuntressKeyObject.$AgentIdKeyValueName -eq 0) {
-            copyLogAndExit -error "ERROR: The agent did not register. Check the log (%ProgramFiles%\Huntress\HuntressAgent.log) for errors. Missing $($HuntressKeyObject.$AgentIdKeyValueName)"
+            copyLogAndExit -throwError "ERROR: The agent did not register. Check the log (%ProgramFiles%\Huntress\HuntressAgent.log) for errors. Missing $($HuntressKeyObject.$AgentIdKeyValueName)"
         }
         LogMessage "Agent registered."
     }
@@ -611,7 +611,7 @@ function runProcess ($process, $flags, $name){
         }
 
         $err = "ERROR: $($name) running as '$($process) $($flags)' failed to complete in $timeout seconds, full error message: '$($msg).'"
-        copyLogAndExit -error $err
+        copyLogAndExit -throwError $err
     }
 }
 
@@ -898,7 +898,7 @@ function logInfo {
     if ( $areURLsAvailable) {
         LogMessage "Network Connectivity verified!"
     } else {
-        copyLogAndExit -error "ERROR: Network connectivity problem detected!"
+        copyLogAndExit -throwError "ERROR: Network connectivity problem detected!"
     }
 
     # Search both 64-bit and 32-bit uninstall registry paths for the required C++ library (version 12+ recommended)
@@ -919,15 +919,19 @@ function logInfo {
 }
 
 # This function copies the Huntress DebugLog to a more permanent location as it's incredibly helpful for troubleshooting.
-# Exits with a code 0 if $error wasn't passed, otherwise throws the error contained in the $error string
+# Exits with a code 0 if $throwError wasn't passed, otherwise throws the error contained in the $throwError string
 function copyLogAndExit {
     param (
-        [string]$error="0"
+        [string]$throwError
     )
 
+    if ( $null -eq $throwError ) {
+        $throwError="0"
+    }
+
     # log the error message first
-    if ($error -ne "0") {
-        LogMessage "WARNING: Script errors detected, operation may not have completed! $error `n$SupportMessage"
+    if ($throwError -ne "0") {
+        LogMessage "WARNING: Script errors detected, operation may not have completed! $throwError `n$SupportMessage"
     }
 
     # sleep to ensure file operations have completed
@@ -939,11 +943,11 @@ function copyLogAndExit {
     if (!$uninstall){
         if (!(Test-Path -path $agentPath)) {New-Item $agentPath -Type Directory}
         try {
-	    Copy-Item -Path $DebugLog -Destination $logLocation -Force -ErrorAction SilentlyContinue
-	    Write-Output "'$($DebugLog)' copied to '$logLocation'."
-	} catch {
-	    Write-Output "Unable to copy Installer log, possible Tamper Protection interference. Look in \Windows\temp\ for HuntressPoShInstaller.log"
-	}
+	       Copy-Item -Path $DebugLog -Destination $logLocation -Force -ErrorAction SilentlyContinue
+	       Write-Output "'$($DebugLog)' copied to '$logLocation'."
+	   } catch {
+	       Write-Output "Unable to copy Installer log, possible Tamper Protection interference. Look in \Windows\temp\ for HuntressPoShInstaller.log"
+	   }
     }
 
     # if no error was passed, exit gracefully, otherwise throw an error and exit
@@ -951,8 +955,8 @@ function copyLogAndExit {
          Write-Output "Script complete!"
          exit 0
     } else {
-        Write-Output "WARNING: Script errors detected, operation may not have completed! Error: [$error]"
-        throw "$error"
+        Write-Output "WARNING: Script errors detected, operation may not have completed! Error: [$throwError]"
+        throw $throwError
     }
 }
 
@@ -1076,7 +1080,7 @@ function main () {
         LogMessage "powershell -executionpolicy bypass -f ./InstallHuntress.powershellv2.ps1 [-acctkey <account_key>] [-orgkey <organization_key>] [-tags <tags>] [-reregister] [-reinstall] [-uninstall] `n"
         LogMessage "Example:"
         LogMessage 'powershell -executionpolicy bypass -f ./InstallHuntress.powershellv2.ps1 -acctkey "0b8a694b2eb7b642069" -orgkey "Buzzword Company Name" -tags "production,US West" '
-        copyLogAndExit -error "No flags or account key found! Exiting."
+        copyLogAndExit -throwError "No flags or account key found! Exiting."
     }
 
 
@@ -1119,7 +1123,7 @@ function main () {
             $assetCount = (Get-ChildItem -Path $agentPath -File | Measure-Object).count
             # to avoid issues with a single file blocking installs, only exit script if multiple files are found and script not run with -reregister or -reinstall
             if ($assetCount -gt 1) {
-              copyLogAndExit -error "The Huntress Agent is already installed in $agentPath. Exiting with no changes. Suggest using -reregister or -reinstall flags. Asset count = $assetCount"
+              copyLogAndExit -throwError "The Huntress Agent is already installed in $agentPath. Exiting with no changes. Suggest using -reregister or -reinstall flags. Asset count = $assetCount"
             }
         }
     }
@@ -1136,7 +1140,7 @@ try {
     main
     Write-InstallScriptInfo
 } catch {
-    copyLogAndExit -error $_.Exception.Message
+    copyLogAndExit -throwError $_.Exception.Message
 }
 
 LogMessage "Script Complete"

From 6a88770254e103504f0834c1739833ccc972f7be Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Mon, 22 Dec 2025 12:01:46 -0500
Subject: [PATCH 3/9] Codacy fix for empty try/catch

---
 Powershell/InstallHuntress.powershellv2.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 31a21bd..0b37481 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -772,14 +772,12 @@ function testNetworkConnectivity {
             # Convert from bytes, if necessary
             if ($Response.Content.GetType() -eq [System.Byte[]]) {
                 $StrContent = [System.Text.Encoding]::UTF8.GetString($Response.Content)
-            }else {
+            } else {
                 $StrContent = $Response.Content.ToString().Trim()
             }
 
             # Remove all newlines from the content
             $StrContent = [string]::join("",($StrContent.Split("`n")))
-
-
             $ContentMatch = $StrContent -eq "96bca0cef10f45a8f7cf68c4485f23a4"
         } catch {
             LogMessage "Error: $($_.Exception.Message)"
@@ -910,7 +908,9 @@ function logInfo {
                 LogMessage "Name: $($app.DisplayName)  Version: $($app.DisplayVersion)"
                 count++
             }
-        } catch {}
+        } catch {
+		    # do nothing for blank entries
+		}
     }
     if ( $count -eq 0 ) {
         LogMessage "Warning: Visual C++ library not found! You may have issues with Huntress running." +

From ddaf36b5dbea25e2fd91af7feaf69670cfc70db0 Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Mon, 22 Dec 2025 15:09:20 -0500
Subject: [PATCH 4/9] Wider encompassing search for Visual C++

---
 Powershell/InstallHuntress.powershellv2.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 0b37481..3804060 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -904,7 +904,7 @@ function logInfo {
     $count = 0
     foreach ( $app in $installedApps) {
         try {
-            if ( $app.DisplayName -like "*vc++*") {
+            if ( $app.DisplayName -like "*Visual C++*") {
                 LogMessage "Name: $($app.DisplayName)  Version: $($app.DisplayVersion)"
                 count++
             }

From 77fab86d58d3af4425e7d3681ca0070b9ad8b41c Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Tue, 23 Dec 2025 15:29:30 -0500
Subject: [PATCH 5/9] Updated VC++ logging with all of the relevant details

Using Uttie's VC++ checking script from this Shortcut https://app.shortcut.com/huntress/story/180295/investigate-windows-8-1-rio-install-failures#activity-180308
---
 Powershell/InstallHuntress.powershellv2.ps1 | 96 ++++++++++++++-------
 1 file changed, 63 insertions(+), 33 deletions(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 3804060..5cf044a 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -72,7 +72,7 @@ $estimatedSpaceNeeded = 200111222
 ##############################################################################
 
 # These are used by the Huntress support team when troubleshooting.
-$ScriptVersion = "Version 2, major revision 8, 2025 Dec 22"
+$ScriptVersion = "Version 2, major revision 8, 2025 Dec 23"
 $ScriptType = "PowerShell"
 
 # variables used throughout this script
@@ -458,7 +458,7 @@ function Test-Installation {
             # if Huntress was installed before this script started and Rio is missing then we log that, but continue with this script
             if ($svc -eq $HuntressEDRServiceName) {
                 if ($isHuntressInstalled) {
-                    LogMessage "Warning: Huntress Process Insights (aka Rio) is installed automatically by the Huntress portal. It can take up to 24 hours to show up"
+                    LogMessage "Information: Huntress Process Insights (aka Rio) is installed automatically by the Huntress portal. It can take up to 24 hours to show up"
                     LogMessage "See more about compatibility here: https://support.huntress.io/hc/en-us/articles/4410699983891-Supported-Operating-Systems-System-Requirements-Compatibility"
                 } else {
                     LogMessage "New install detected. It may take 24 hours for Huntress EDR (Rio) to install!"
@@ -853,13 +853,13 @@ function logInfo {
         LogMessage "Warning: Not run under the SYSTEM user, you may have issues with Huntress Tamper Protection"
     }
 
-    # Log machine uptime
+    # Log machine uptime, use -1 to call attention to machines that have issues running the GCIM command
     try
     {
         $uptime = ((Get-Date) - (GCIM Win32_OperatingSystem).LastBootUpTime).days
     } catch {
         LogMessage "Unable to determine system uptime"
-        $uptime = 0
+        $uptime = -1
     }
     if ($uptime -gt 9) {
         LogMessage "Warning, high uptime detected  This machine may need a reboot in order to resolve Windows update-based file locks."
@@ -898,36 +898,15 @@ function logInfo {
     } else {
         copyLogAndExit -throwError "ERROR: Network connectivity problem detected!"
     }
-
-    # Search both 64-bit and 32-bit uninstall registry paths for the required C++ library (version 12+ recommended)
-    $installedApps = (Get-ItemProperty 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*', 'HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*' )
-    $count = 0
-    foreach ( $app in $installedApps) {
-        try {
-            if ( $app.DisplayName -like "*Visual C++*") {
-                LogMessage "Name: $($app.DisplayName)  Version: $($app.DisplayVersion)"
-                count++
-            }
-        } catch {
-		    # do nothing for blank entries
-		}
-    }
-    if ( $count -eq 0 ) {
-        LogMessage "Warning: Visual C++ library not found! You may have issues with Huntress running." +
-                   " Highly recommend installing C++ and trying the deploy again: https://www.microsoft.com/en-us/download/details.aspx?id=48145"
-    }
 }
 
-# This function copies the Huntress DebugLog to a more permanent location as it's incredibly helpful for troubleshooting.
+# This function copies the Huntress DebugLog to a more permanent location as it's incredibly helpful for troubleshooting. AB
 # Exits with a code 0 if $throwError wasn't passed, otherwise throws the error contained in the $throwError string
 function copyLogAndExit {
     param (
         [string]$throwError
     )
-
-    if ( $null -eq $throwError ) {
-        $throwError="0"
-    }
+    if ( [string]::IsNullOrEmpty($throwError) ) { $throwError="0" }
 
     # log the error message first
     if ($throwError -ne "0") {
@@ -943,15 +922,15 @@ function copyLogAndExit {
     if (!$uninstall){
         if (!(Test-Path -path $agentPath)) {New-Item $agentPath -Type Directory}
         try {
-	       Copy-Item -Path $DebugLog -Destination $logLocation -Force -ErrorAction SilentlyContinue
-	       Write-Output "'$($DebugLog)' copied to '$logLocation'."
-	   } catch {
-	       Write-Output "Unable to copy Installer log, possible Tamper Protection interference. Look in \Windows\temp\ for HuntressPoShInstaller.log"
-	   }
+           Copy-Item -Path $DebugLog -Destination $logLocation -Force -ErrorAction SilentlyContinue
+           Write-Output "'$($DebugLog)' copied to '$logLocation'."
+       } catch {
+           Write-Output "Unable to copy Installer log, possible Tamper Protection interference. Look in \Windows\temp\ for HuntressPoShInstaller.log"
+       }
     }
 
     # if no error was passed, exit gracefully, otherwise throw an error and exit
-    if ($error -eq "0") {
+    if ($throwError -eq "0") {
          Write-Output "Script complete!"
          exit 0
     } else {
@@ -1041,12 +1020,60 @@ function Write-InstallScriptInfo {
     $ErrorActionPreference = $hold
 }
 
+# Logging Visual C++ info for a Windows 8.1 specific issue
+function libraryCheck {
+    # Since this issue only affects Win 8.1, check the OS version before logging.
+    try {
+        if ( (Get-CimInstance -classname Win32_OperatingSystem | select caption) -notlike "*8.1*") {
+            LogMessage "Windows 8.1 not detected, not checking for missing dependencies"
+            return
+        }
+    } catch { LogMessage "Unable to determine system OS. Checking for dependencies just in case, but this Visual C++ check is only relevant for Windows 8.1 machines!" }
+
+    # Fleet Health Check: UCRT + VC Redistributables
+    $Results = [PSCustomObject]@{
+        ComputerName  = $env:COMPUTERNAME
+        KB2919355     = "Missing, install KB2919355 https://www.microsoft.com/en-us/download/details.aspx?id=42327"
+        KB2999226     = "Missing, install KB2999226 https://www.microsoft.com/en-ie/download/details.aspx?id=51109"
+        UCRT_Version  = "None, install Universal CRT https://support.microsoft.com/en-us/topic/update-for-universal-c-runtime-in-windows-c0514201-7fe6-95a3-b0a5-287930f3560c"
+        VCRedist_x64  = "Not Found, install x64 Visual C++ Redistributable v14 https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#visual-c-redistributable-v14"
+        VCRedist_x86  = "Not Found, install x86 Visual C++ Redistributable v14 https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#visual-c-redistributable-v14"
+    }
+
+    # 1. Check for KBs
+    $Hotfixes = Get-HotFix | Select-Object -ExpandProperty HotFixID
+    if ($Hotfixes -contains "KB2919355") { $Results.KB2919355 = "Installed`n" }
+    if ($Hotfixes -contains "KB2999226") { $Results.KB2999226 = "Installed`n" }
+
+    # 2. Check for UCRT DLL Version
+    if (Test-Path "$env:windir\System32\ucrtbase.dll") {
+        $Results.UCRT_Version = "$((Get-Item "$env:windir\System32\ucrtbase.dll").VersionInfo.ProductVersion)  (version 10.0.14393+ is recommended)"
+    }
+
+    # 3. Check for VC Redist 2015-2022 via Registry (Fastest for Fleet)
+    $UninstallKeys = @(
+        "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*",
+        "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
+    )
+    Get-ItemProperty $UninstallKeys | Where-Object { $_.psobject.Properties["DisplayName"] } | Where-Object { $_.DisplayName -like "*Visual C++*" } | ForEach-Object {
+        if ($_.DisplayName -like "*x64*") { $Results.VCRedist_x64 = "$($_.DisplayVersion)  (version 14+ is recommended)" }
+        if ($_.DisplayName -like "*x86*") { $Results.VCRedist_x86 = "$($_.DisplayVersion)  (version 14+ is recommended)" }
+    }
+
+    # Save each of the name and property values on a new line in the installer log
+    foreach ($property in $Results.PSObject.Properties) {
+        if ($null -ne $property) { LogMessage "$($property.Name) - $($property.Value)" }
+    }
+}
+
+
 #########################################################################################
 #                                  begin main function                                  #
 #########################################################################################
 function main () {
     # Start the script with logging as much as we can as soon as we can. All your logging are belong to us, Zero Wang.
     logInfo
+
     LogMessage "Script flags:  Reregister=$reregister  Reinstall=$reinstall  Uninstall=$uninstall "
 
     if ($AccountKey.length -lt 8) {
@@ -1063,6 +1090,9 @@ function main () {
         copyLogAndExit
     }
 
+    # Logging some additional info for a temporary issue with Windows 8.1 and missing Visual C++ dependencies
+    libraryCheck
+
     # if the agent is orphaned, switch to the full uninstall/reinstall (reregister flag)
     if ( !($reregister)) {
         $orphanStatus = isOrphan

From e08dc2478b49caf767afeb8f3d055e30b882fb7b Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Tue, 23 Dec 2025 15:36:39 -0500
Subject: [PATCH 6/9] Following automated code checkers suggestions

---
 Powershell/InstallHuntress.powershellv2.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 5cf044a..8787011 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -1024,7 +1024,7 @@ function Write-InstallScriptInfo {
 function libraryCheck {
     # Since this issue only affects Win 8.1, check the OS version before logging.
     try {
-        if ( (Get-CimInstance -classname Win32_OperatingSystem | select caption) -notlike "*8.1*") {
+        if ( (Get-CimInstance -classname Win32_OperatingSystem | Select-Object caption) -notlike "*8.1*") {
             LogMessage "Windows 8.1 not detected, not checking for missing dependencies"
             return
         }

From b28978ed3783dbb89671480d760b2ff724d84513 Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Wed, 24 Dec 2025 11:16:33 -0500
Subject: [PATCH 7/9] Logging improvements, fix Write-InstallScriptInfo
 execution

* Changing the order of logging around for efficiency. Log as much overview info as possible first in case the script is unable to complete the overview info will at least be logged (script version, flags that were passed, and keys).
* Write-InstallScriptInfo was not able to run previously as 'main' always was exiting before the function 'Write-InstallScriptInfo' could be called. Moved the exit command to later in execution.
---
 Powershell/InstallHuntress.powershellv2.ps1 | 22 +++++++++------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 8787011..007d215 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -72,7 +72,7 @@ $estimatedSpaceNeeded = 200111222
 ##############################################################################
 
 # These are used by the Huntress support team when troubleshooting.
-$ScriptVersion = "Version 2, major revision 8, 2025 Dec 23"
+$ScriptVersion = "Version 2, major revision 8, 2025 Dec 24"
 $ScriptType = "PowerShell"
 
 # variables used throughout this script
@@ -807,10 +807,6 @@ function testNetworkConnectivity {
 
 # Log useful data about the machine for troubleshooting AB
 function logInfo {
-    # gather info on the host for logging purposes
-    LogMessage "Script type: '$ScriptType'"
-    LogMessage "Script version: '$ScriptVersion'"
-
     # if Huntress was already installed, pull version info and TP status
     LogMessage "Script cursory check, is Huntress installed already: $($isHuntressInstalled)"
     if ($isHuntressInstalled){
@@ -893,7 +889,7 @@ function logInfo {
     }
 
     $areURLsAvailable = testNetworkConnectivity
-    if ( $areURLsAvailable) {
+    if ( $areURLsAvailable ) {
         LogMessage "Network Connectivity verified!"
     } else {
         copyLogAndExit -throwError "ERROR: Network connectivity problem detected!"
@@ -1062,7 +1058,7 @@ function libraryCheck {
 
     # Save each of the name and property values on a new line in the installer log
     foreach ($property in $Results.PSObject.Properties) {
-        if ($null -ne $property) { LogMessage "$($property.Name) - $($property.Value)" }
+	if ($null -ne $property) { LogMessage "$($property.Name) - $($property.Value)" }
     }
 }
 
@@ -1071,19 +1067,19 @@ function libraryCheck {
 #                                  begin main function                                  #
 #########################################################################################
 function main () {
-    # Start the script with logging as much as we can as soon as we can. All your logging are belong to us, Zero Wang.
-    logInfo
-
+    # Start the script with logging to capture useful data for troubleshooting. All your logging are belong to us, Zero Wang.
+    LogMessage "Script type: '$ScriptType'"
+    LogMessage "Script version: '$ScriptVersion'"
     LogMessage "Script flags:  Reregister=$reregister  Reinstall=$reinstall  Uninstall=$uninstall "
-
     if ($AccountKey.length -lt 8) {
         LogMessage "Invalid key length, found $($AccountKey.length) (should be 32). Account key value: $AccountKey"
     } else {
         $masked = $AccountKey.Substring(0,4) + "************************" + $AccountKey.SubString($AccountKey.length-4,4)
         LogMessage "Pre-trim variables: account key=[$masked]  org key=[$OrganizationKey]   (brackets are in place to show trailing/leading spaces)"
     }
+    logInfo
 
-    # if run with the uninstall flag, exit so we don't reinstall the agent after
+    # if run with the uninstall flag, exit afterward so we don't reinstall the agent after
     if ($uninstall) {
         LogMessage "Uninstalling Huntress agent"
         uninstallHuntress
@@ -1163,7 +1159,6 @@ function main () {
     fixServices
     Test-Installation
     LogMessage "Huntress Agent successfully installed!"
-    copyLogAndExit
 }
 
 try {
@@ -1174,3 +1169,4 @@ try {
 }
 
 LogMessage "Script Complete"
+copyLogAndExit

From b3a215a0980c5a634f08c6891b928f153fef36bd Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Wed, 24 Dec 2025 11:19:38 -0500
Subject: [PATCH 8/9] Formatting glow up

---
 Powershell/InstallHuntress.powershellv2.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 007d215..07e4574 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -1058,7 +1058,7 @@ function libraryCheck {
 
     # Save each of the name and property values on a new line in the installer log
     foreach ($property in $Results.PSObject.Properties) {
-	if ($null -ne $property) { LogMessage "$($property.Name) - $($property.Value)" }
+		if ($null -ne $property) { LogMessage "$($property.Name) - $($property.Value)" }
     }
 }
 

From 0475c500de3a672dd102137fa33e77b3cf2ee3ae Mon Sep 17 00:00:00 2001
From: "Alan Bishop [Huntress]"
 <109673875+Alan-Huntress@users.noreply.github.com>
Date: Mon, 29 Dec 2025 09:27:42 -0500
Subject: [PATCH 9/9] Updated URLs for testing network connectivity

The URLs the agent uses have changed slightly over time.
---
 Powershell/InstallHuntress.powershellv2.ps1 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Powershell/InstallHuntress.powershellv2.ps1 b/Powershell/InstallHuntress.powershellv2.ps1
index 07e4574..214234d 100644
--- a/Powershell/InstallHuntress.powershellv2.ps1
+++ b/Powershell/InstallHuntress.powershellv2.ps1
@@ -750,16 +750,17 @@ function testNetworkConnectivity {
     Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Internet Explorer\Main" -Name "DisableFirstRunCustomize" -Value 2
 
     $file_name = "96bca0cef10f45a8f7cf68c4485f23a4.txt"
-    $URLs = @(("https://eetee.huntress.io/{0}"-f $file_name),
-    ("https://huntress-installers.s3.us-east-1.amazonaws.com/agent/connectivity/{0}" -f $file_name),
-    ("https://huntress-rio.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
-    ("https://huntress-survey-results.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
-    ("https://huntress-updates.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
-    ("https://huntress-uploads.s3.us-west-2.amazonaws.com/agent/connectivity/{0}" -f $file_name),
-    ("https://huntress-user-uploads.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
-    ("https://huntress.io/agent/connectivity/{0}" -f $file_name),
-    ("https://huntresscdn.com/agent/connectivity/{0}" -f $file_name),
-    ("https://update.huntress.io/agent/connectivity/{0}" -f $file_name))
+    $URLs = @(("https://update.huntress.io/agent/connectivity/{0}" -f $file_name),
+			("https://huntress.io/agent/connectivity/{0}" -f $file_name),
+			("https://eetee.huntress.io/{0}"-f $file_name),
+			("https://huntresscdn.com/agent/connectivity/{0}" -f $file_name),
+			("https://huntress-installers.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
+			("https://huntress-updates.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
+			("https://huntress-uploads.s3.us-west-2.amazonaws.com/agent/connectivity/{0}" -f $file_name),
+			("https://huntress-user-uploads.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
+			("https://huntress-rio.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
+			("https://huntress-survey-results.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name),
+			("https://huntress-log-uploads.s3.amazonaws.com/agent/connectivity/{0}" -f $file_name))
 
     foreach ($URL in $URLs) {
         $StatusCode = 0