Merge pull request #1068 from mandiant/fix-dokan-install

Add 1603 to validExitCodes
mandiant · Jun 7, 2024 · 60daf3d · 60daf3d
2 parents 7ceb07c + 998bb17
commit 60daf3d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/packages/common.vm/common.vm.nuspec b/packages/common.vm/common.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>common.vm</id>
-    <version>0.0.0.20240516</version>
+    <version>0.0.0.20240531</version>
     <description>Common libraries for VM-packages</description>
     <authors>Mandiant</authors>
   </metadata>

diff --git a/packages/common.vm/tools/vm.common/vm.common.psm1 b/packages/common.vm/tools/vm.common/vm.common.psm1
@@ -676,7 +676,7 @@ function VM-Install-With-Installer {
         [Parameter(Mandatory=$false)]
         [string] $sha256,
         [Parameter(Mandatory=$false)]
-        [array] $validExitCodes= @(0, 3010, 1605, 1614, 1641),
+        [array] $validExitCodes= @(0, 3010, 1603, 1605, 1614, 1641),
         [Parameter(Mandatory=$false)]
         [bool] $consoleApp=$false,
         [Parameter(Mandatory=$false)]

diff --git a/packages/dokan.vm/dokan.vm.nuspec b/packages/dokan.vm/dokan.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>dokan.vm</id>
-    <version>2.1.0</version>
+    <version>2.1.0.20240603</version>
     <authors>kacos2000</authors>
     <description>Dokan simplifies the creation of custom file systems on Windows without the complexity of developing kernel-level drivers, offering an accessible solution for file system development, similar to FUSE on Linux.</description>
     <dependencies>

diff --git a/packages/dokan.vm/tools/chocolateyinstall.ps1 b/packages/dokan.vm/tools/chocolateyinstall.ps1
@@ -8,6 +8,7 @@ $exeSha256 = '930b596d6cd7a8f3508f39bd4eab8c2f178178d39d11a9e135180b69820df47f'
 
 $fileType = 'MSI'
 $silentArgs = '/qn /norestart'
+$validExitCodes= @(0, 3010, 1603, 1605, 1614, 1641)
 
 try {
     $toolDir = Join-Path ${Env:RAW_TOOLS_DIR} $toolName
@@ -33,6 +34,7 @@ try {
         fileType      = $fileType
         file          = $installerPath
         silentArgs    = $silentArgs
+        validExitCodes= $validExitCodes
         softwareName  = $toolName
     }
     Install-ChocolateyInstallPackage @packageArgs