From caccfa6380c46e9fb336a5c0780632c60e0044c9 Mon Sep 17 00:00:00 2001 From: Marko Bozikovic Date: Wed, 6 Mar 2024 12:34:24 +0100 Subject: [PATCH] ChocolateyInstall env var. patch, cherry picked from PR #178 --- .../cChocoPackageInstall/cChocoPackageInstall.psm1 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/DSCResources/cChocoPackageInstall/cChocoPackageInstall.psm1 b/DSCResources/cChocoPackageInstall/cChocoPackageInstall.psm1 index 7ee00d0..0e71f41 100644 --- 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