Merge pull request #1146 from d35ha/fix-googlechrome.vm

Support the valid return codes at googlechrome.vm
mandiant · Oct 2, 2024 · 8547c45 · 8547c45
2 parents 622c271 + 0e2f340
commit 8547c45
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/packages/googlechrome.vm/googlechrome.vm.nuspec b/packages/googlechrome.vm/googlechrome.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>googlechrome.vm</id>
-    <version>0.0.0.20240425</version>
+    <version>0.0.0.20241002</version>
     <authors>Google LLC.</authors>
     <description>Chrome is a popular web browser.</description>
     <dependencies>

diff --git a/packages/googlechrome.vm/tools/chocolateyinstall.ps1 b/packages/googlechrome.vm/tools/chocolateyinstall.ps1
@@ -1,6 +1,10 @@
 $ErrorActionPreference = 'Stop'
 Import-Module vm.common -Force -DisableNameChecking
 
+$fileType = "MSI"
+$silentArgs = "/quiet /norestart /l*v `"$($env:TEMP)\$($env:chocolateyPackageName).$($env:chocolateyPackageVersion).MsiInstall.log`""
+$validExitCodes = @(0, 3010, 1603, 1605, 1614, 1641)
+
 try {
     # Download the installer
     $packageArgs        = @{
@@ -14,11 +18,12 @@ try {
     VM-Assert-Signature $filePath
 
     # Install the downloaded installer
-    $packageArgs        = @{
-        packageName     = $env:ChocolateyPackageName
-        file            = $filePath
-        fileType        = 'MSI'
-        silentArgs      = "/quiet /norestart /l*v `"$($env:TEMP)\$($env:chocolateyPackageName).$($env:chocolateyPackageVersion).MsiInstall.log`""
+    $packageArgs = @{
+        packageName    = $env:ChocolateyPackageName
+        file           = $filePath
+        fileType       = $fileType
+        silentArgs     = $silentArgs
+        validExitCodes = $validExitCodes
     }
     Install-ChocolateyInstallPackage @packageArgs -ErrorAction SilentlyContinue