ChocolateyInstall env var. patch, cherry picked from PR chocolatey#178

bozho · Mar 6, 2024 · caccfa6 · caccfa6
1 parent f583fee
commit caccfa6
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/DSCResources/cChocoPackageInstall/cChocoPackageInstall.psm1 b/DSCResources/cChocoPackageInstall/cChocoPackageInstall.psm1
@@ -501,6 +501,11 @@ function Get-ChocoInstalledPackage {
         [switch]$NoCache
     )
 
+    if ([string]::IsNullOrEmpty($env:ChocolateyInstall))
+    {
+        $env:ChocolateyInstall = [environment]::GetEnvironmentVariable('ChocolateyInstall', 'Machine')
+    }
+
     $ChocoInstallLP = Join-Path -Path $env:ChocolateyInstall -ChildPath 'cache'
     if ( -not (Test-Path $ChocoInstallLP)){
         New-Item -Name 'cache' -Path $env:ChocolateyInstall -ItemType Directory | Out-Null
@@ -532,6 +537,12 @@ function Get-ChocoVersion {
         [switch]$Purge,
         [switch]$NoCache
     )
+
+    if ([string]::IsNullOrEmpty($env:ChocolateyInstall))
+    {
+        $env:ChocolateyInstall = [environment]::GetEnvironmentVariable('ChocolateyInstall', 'Machine')
+    }
+
     $chocoInstallCache = Join-Path -Path $env:ChocolateyInstall -ChildPath 'cache'
     if ( -not (Test-Path $chocoInstallCache)){
         New-Item -Name 'cache' -Path $env:ChocolateyInstall -ItemType Directory | Out-Null