Merge branch 'Version2.2' into main

Author: Pnwcomputers

SystemTester.ps1

@@ -119,9 +119,6 @@ function Test-ToolVerification {
 
     foreach ($tool in $allTools) {
         $result = Test-ToolIntegrity -ToolName $tool
-        if (-not $stats.ContainsKey($result.Status)) {
-            $stats[$result.Status] = 0
-        }
         $stats[$result.Status]++
 
         $color = switch ($result.Status) {
@@ -163,28 +160,15 @@ function Test-ToolVerification {
     Write-Host ""
 
     $totalIssues = $stats.BAD_SIZE + $stats.BAD_SIGNATURE + $stats.MISSING + $stats.CHECK_FAILED
-    if ($totalIssues -eq 0 -and ($stats.VALID_MS + $stats.VALID_OTHER + $stats.NOT_SIGNED) -gt 0) {
+    if ($totalIssues -eq 0 -and $stats.VALID_MS -gt 0) {
         Write-Host "STATUS: All present tools are verified and safe to use" -ForegroundColor Green
-        Write-Host ""
-        return $true
-    }
-
-    if ($totalIssues -gt 0) {
+    } elseif ($totalIssues -gt 0) {
         Write-Host "STATUS: $totalIssues issue(s) detected - recommend re-download" -ForegroundColor Yellow
         if ($script:LaunchedViaBatch) {
             Write-Host "ACTION: Use Batch Menu Option 5 to re-download tools" -ForegroundColor Yellow
         }
-        Write-Host ""
-        return $false
-    }
-
-    Write-Host "STATUS: No tools were successfully verified" -ForegroundColor Yellow
-    Write-Host "        Ensure Sysinternals Suite is installed" -ForegroundColor Yellow
-    if ($script:LaunchedViaBatch) {
-        Write-Host "ACTION: Use Batch Menu Option 5 to download tools" -ForegroundColor Yellow
     }
     Write-Host ""
-    return $false
 }
 
 # Initialize environment
@@ -284,7 +268,7 @@ function Convert-ToolOutput {
 }
 
 # Run tool
-function Invoke-Tool {
+function Run-Tool {
     param(
         [string]$ToolName,
         [Alias('Args')]
@@ -312,13 +296,13 @@ function Invoke-Tool {
     try {
         $start = Get-Date
         if ($ToolName -in @("psinfo","pslist","handle","autorunsc","testlimit","contig")) {
-            $ArgumentList = "-accepteula $ArgumentList"
+            $Args = "-accepteula $Args"
         }
 
-        $argArray = if ($ArgumentList.Trim()) { $ArgumentList.Split(' ') | Where-Object { $_ } } else { @() }
+        $argArray = if ($Args.Trim()) { $Args.Split(' ') | Where-Object { $_ } } else { @() }
         $rawOutput = & $toolPath $argArray 2>&1 | Out-String
         $duration = ((Get-Date) - $start).TotalMilliseconds
-        $cleanOutput = Convert-ToolOutput -ToolName $ToolName -RawOutput $rawOutput
+        $cleanOutput = Clean-ToolOutput -ToolName $ToolName -RawOutput $rawOutput
 
         $script:TestResults += @{
             Tool=$ToolName; Description=$Description