SERVER-34451 Ignore errors downloading and installing compass

2 files changed, 14 insertions, 8 deletions

diff --git a/src/mongo/installer/compass/Install-Compass.ps1.in b/src/mongo/installer/compass/Install-Compass.ps1.in
index 001ae9de085..11d79a30696 100755
--- a/src/mongo/installer/compass/Install-Compass.ps1.in
+++ b/src/mongo/installer/compass/Install-Compass.ps1.in
@@ -31,13 +31,19 @@ $CompassExe = "$TemporaryDir" + "compass-install.exe"
 

 Remove-Item $CompassExe -ErrorAction:Ignore

 

-Write-Output "Downloading Compass from $CompassUrl"

-Invoke-WebRequest -Uri $CompassUrl -OutFile $CompassExe

-

-Write-Output "Installing Compass"

-& $CompassExe

+try {

+    Write-Output "Downloading Compass from $CompassUrl"

+    Invoke-WebRequest -Uri $CompassUrl -OutFile $CompassExe

+

+    Write-Output "Installing Compass"

+    & $CompassExe

+    Write-Output "Successfully installed Compass"

+} catch {

+    # Fail silently. With the way that we've hooked into the MSI

+    # currently we're not able to do any meaningful error reporting

+    # and not crash the installer.

+    Write-Output "Error installing Compass."

+}

 

 # Remove the binary we downloaded

 Remove-Item $CompassExe -ErrorAction:Ignore

-

-Write-Output "Successfully installed Compass"

diff --git a/src/mongo/installer/msi/wxs/Installer_64.wxs b/src/mongo/installer/msi/wxs/Installer_64.wxs
index b0abe359a73..c2b8d8e2a49 100644
--- a/src/mongo/installer/msi/wxs/Installer_64.wxs
+++ b/src/mongo/installer/msi/wxs/Installer_64.wxs
@@ -194,7 +194,7 @@
         BinaryKey="WixCA"

         DllEntry="WixQuietExec64"

         Execute="deferred"

-        Return="check"

+        Return="ignore"

         Impersonate="yes" />

 

     <InstallExecuteSequence>