Skip to content

Commit

Permalink
(GH-274) Allow unattended installs as non-admin user
Browse files Browse the repository at this point in the history
Previously, if a non-admin user attempted to install chocolatey,
a message indicating that non-admin installs were for advanced
users only would appear and block the installation.

Advanced users know what they are doing, so allow them to
set the ChocolateyEnvironmentAllowGlobalConfirmation environment
variable, just like they can pass -y to any other invocation
of chocolatey.
  • Loading branch information
smspillaz committed May 7, 2015
1 parent a7de809 commit 92a1621
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions nuget/chocolatey/tools/chocolateysetup.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ param(

$chocoNew = Join-Path $thisScriptFolder 'chocolateyInstall\choco.exe'
if ($debugMode) {
& $chocoNew unpackself -fdv
& $chocoNew unpackself -fdvy
} else {
& $chocoNew unpackself -f
& $chocoNew unpackself -fy
}

$installModule = Join-Path $thisScriptFolder 'chocolateyInstall\helpers\chocolateyInstaller.psm1'
Expand Down Expand Up @@ -314,9 +314,9 @@ param(
Copy-Item $chocoExe $chocoExeDest -force

if ($debugMode) {
& $chocoExeDest unpackself -fdv
& $chocoExeDest unpackself -fdvy
} else {
& $chocoExeDest unpackself -f
& $chocoExeDest unpackself -fy
}
}

Expand Down

0 comments on commit 92a1621

Please sign in to comment.