If Chocolatey has just been installed yet its env variable is missing…

…, force refresh PS and chocolatey environments
chocolatey-community · Apr 2, 2021 · 82c016b · 82c016b
1 parent 64f1aca
commit 82c016b
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Chocolatey/DscResources/ChocolateyPackage/ChocolateyPackage.psm1 b/Chocolatey/DscResources/ChocolateyPackage/ChocolateyPackage.psm1
@@ -97,10 +97,10 @@ function Set-TargetResource
         $ChocoCommand = switch ($Ensure) {
             'Present' {
                 if ($testResult.PackagePresent -and !$testResult.VersionGreaterOrEqual) {
-                    Get-Command Update-ChocolateyPackage 
+                    Get-Command Update-ChocolateyPackage
                 }
                 elseif (!$UpdateOnly) {
-                    Get-Command Install-ChocolateyPackage 
+                    Get-Command Install-ChocolateyPackage
                 }
                 else {
                     Write-Verbose "Nothing to do: UpdateOnly : $UpdateOnly"
@@ -143,12 +143,12 @@ function Set-TargetResource
         &$ChocoCommand @ChocoCommandParams -verbose | Write-Verbose
 
         $PostActionResult = Test-ChocolateyPackageIsInstalled @TestParams
-        if ($PostActionResult.PackagePresent -and 
+        if ($PostActionResult.PackagePresent -and
             $PostActionResult.VersionGreaterOrEqual -and
             $Ensure -eq 'Present') {
             Write-Verbose -Message "--> Package Successfully Installed"
         }
-        elseif ((!$PostActionResult.PackagePresent -or 
+        elseif ((!$PostActionResult.PackagePresent -or
                 !$PostActionResult.VersionGreaterOrEqual) -and
                  $Ensure -eq 'Absent') {
             Write-Verbose -Message "--> Package Successfully Removed"
@@ -206,6 +206,14 @@ function Test-TargetResource
         }
     }
 
+    Write-Verbose "Testing whether we need to refresh the PS environment so chocolatey doesn't fail"
+    if ($null -eq $env:ChocolateyInstall) {
+        write-verbose "Set ChocolateyInstall"
+        $env:ChocolateyInstall = Convert-Path "$((Get-Command choco).Path)\..\.."
+        Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
+        refreshenv > $null
+    }
+
     $EnsureResultMap = @{
         'Present' = $true
         'Absent'  = $false