when running with administrative rights, set environment variables at…

… Machine scope

The CurrentPrincipal::IsInRole(Administrators) check is sufficient to
ascertain administrative rights, whether UAC is enabled or not.

In particular, if UAC is enabled, this check will only return true if
running elevated.

This change enables per-machine installation on systems with UAC enabled
(only if the user installs/invokes Chocolatey from an elevated shell, so UAC
prompt is not triggered), while not disrupting the behavior for standard users.

nuget/tools/chocolateysetup.psm1

@@ -88,9 +88,8 @@ param(
   [string]$folder
 )
   $environmentTarget = [System.EnvironmentVariableTarget]::User
-  $UACEnabled = Get-UACEnabled
-  if ((Test-AdminRights) -and !$UACEnabled) {
-    Write-Debug "Administrator installing with UAC disabled so using Machine environment variable target instead of User."
+  if (Test-AdminRights) {
+    Write-Debug "Administrator installing so using Machine environment variable target instead of User."
     $environmentTarget = [System.EnvironmentVariableTarget]::Machine
   }
     Write-Host "Creating $chocInstallVariableName as an Environment variable (targeting `'$environmentTarget`') and setting it to `'$folder`'"
@@ -154,9 +153,8 @@ param(
 )
 
   $environmentTarget = [System.EnvironmentVariableTarget]::User
-  $UACEnabled = Get-UACEnabled
-  if ((Test-AdminRights) -and !$UACEnabled) {
-    Write-Debug "Administrator installing with UAC disabled so using Machine environment variable target instead of User."
+  if (Test-AdminRights) {
+    Write-Debug "Administrator installing so using Machine environment variable target instead of User."
     $environmentTarget = [System.EnvironmentVariableTarget]::Machine
   }
 

src/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1

@@ -41,8 +41,7 @@ param(
   Write-Debug "Running 'Install-ChocolateyEnvironmentVariable' with variableName:`'$variableName`' and variableValue:`'$variableValue`'";
 
   if ($variableType -eq [System.EnvironmentVariableTarget]::Machine) {
-    $UACEnabled = Get-UACEnabled
-    if ((Test-AdminRights) -and !$UACEnabled) {
+    if (Test-AdminRights) {
       [Environment]::SetEnvironmentVariable($variableName, $variableValue, $variableType)
     } else {
       $psArgs = "[Environment]::SetEnvironmentVariable(`'$variableName`',`'$variableValue`', `'$variableType`')"

src/helpers/functions/Install-ChocolateyPath.ps1

@@ -22,8 +22,7 @@ param(
     $actualPath = $actualPath + $pathToInstall
 
     if ($pathType -eq [System.EnvironmentVariableTarget]::Machine) {
-      $UACEnabled = Get-UACEnabled
-      if ((Test-AdminRights) -and !$UACEnabled) {
+      if (Test-AdminRights) {
         [Environment]::SetEnvironmentVariable('Path', $actualPath, $pathType)
       } else {
         $psArgs = "[Environment]::SetEnvironmentVariable('Path',`'$actualPath`', `'$pathType`')"