diff options
author | Mathew Robinson <chasinglogic@gmail.com> | 2018-06-06 11:18:06 -0400 |
---|---|---|
committer | Mathew Robinson <chasinglogic@gmail.com> | 2018-06-08 14:26:11 -0400 |
commit | 84def3fb252f3c17c9b04205bf4770b3701979e6 (patch) | |
tree | 8f7187f767344c6c5e0f191e9f4f9e8d126a22ad /src/mongo/installer | |
parent | feaade118c2defedcfb95687572d9edd4a10eca9 (diff) | |
download | mongo-84def3fb252f3c17c9b04205bf4770b3701979e6.tar.gz |
SERVER-34451 Ignore errors downloading and installing compass
Diffstat (limited to 'src/mongo/installer')
-rwxr-xr-x | src/mongo/installer/compass/Install-Compass.ps1.in | 20 | ||||
-rw-r--r-- | src/mongo/installer/msi/wxs/Installer_64.wxs | 2 |
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 f79c9c3aaf1..64b9932d64c 100644 --- a/src/mongo/installer/msi/wxs/Installer_64.wxs +++ b/src/mongo/installer/msi/wxs/Installer_64.wxs @@ -107,7 +107,7 @@ BinaryKey="WixCA"
DllEntry="WixQuietExec64"
Execute="deferred"
- Return="check"
+ Return="ignore"
Impersonate="yes" />
<InstallExecuteSequence>
|