isolate chocolatey bootstrapper execution

fixes #2742
added output capture/return, exit code check to bootstrapper exec
reviewable/pr18780/r1
nitzmahone 8 years ago
parent 75669a4d0b
commit 0d8a7b875e

@ -59,7 +59,12 @@ Function Chocolatey-Install-Upgrade
if ($ChocoAlreadyInstalled -eq $null) if ($ChocoAlreadyInstalled -eq $null)
{ {
#We need to install chocolatey #We need to install chocolatey
iex ((new-object net.webclient).DownloadString("https://chocolatey.org/install.ps1")) $install_output = (new-object net.webclient).DownloadString("https://chocolatey.org/install.ps1") | powershell -
if ($LASTEXITCODE -ne 0)
{
Set-Attr $result "choco_bootstrap_output" $install_output
Fail-Json $result "Chocolatey bootstrap installation failed."
}
$result.changed = $true $result.changed = $true
$script:executable = "C:\ProgramData\chocolatey\bin\choco.exe" $script:executable = "C:\ProgramData\chocolatey\bin\choco.exe"
} }

Loading…
Cancel
Save