Merge pull request #944 from Ana06/sysinternals-path

[sysinternals.vm] Add tools to PATH & fix exception order
mandiant · Mar 6, 2024 · 45790b3 · 45790b3
2 parents 0b7f4d8 + 25fbbee
commit 45790b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/sysinternals.vm/sysinternals.vm.nuspec b/packages/sysinternals.vm/sysinternals.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>sysinternals.vm</id>
-    <version>0.0.0.20240112</version>
+    <version>0.0.0.20240306</version>
     <authors>Mark Russinovich, Bryce Cogswell</authors>
     <description>Sysinternals suite.</description>
     <dependencies>

diff --git a/packages/sysinternals.vm/tools/chocolateyinstall.ps1 b/packages/sysinternals.vm/tools/chocolateyinstall.ps1
@@ -22,12 +22,14 @@ try {
         VM-Assert-Signature $_.FullName
     }
 } catch {
-  VM-Write-Log-Exception $_
-  # Remove files with invalid signature
-  Remove-Item $toolDir -Recurse -Force -ea 0 | Out-Null
+    # Remove files with invalid signature
+    Remove-Item $toolDir -Recurse -Force -ea 0 | Out-Null
+    VM-Write-Log-Exception $_
 }
 
 try {
+    # Add sysinternals tools to path
+    Install-ChocolateyPath $toolDir
     # Add shortcut to sysinternals folder
     $shortcutDir = Join-Path ${Env:TOOL_LIST_DIR} $category
     $shortcut = Join-Path $shortcutDir 'sysinternals.lnk'