Skip to content

Change [System.Environment]::SetEnvironmentVariable() to Set-ItemProperty #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 18, 2025
Merged

Change [System.Environment]::SetEnvironmentVariable() to Set-ItemProperty #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f0646a
pkotov87 - change System.Environment]::SetEnvironmentVariable() to Se…
pkotov87 Jan 29, 2025
e8f4514
pkotov87 - change System.Environment]::SetEnvironmentVariable() to Se…
pkotov87 Jan 29, 2025
4a64e78
pkotov87 - change System.Environment]::SetEnvironmentVariable() to Se…
pkotov87 Jan 29, 2025
9e5aa9e
Merge branch 'main' into main
danadoherty639 Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ def munge_psmodulepath(resource)
<<~MUNGE_PSMODULEPATH.strip
$UnmungedPSModulePath = [System.Environment]::GetEnvironmentVariable('PSModulePath','machine')
$MungedPSModulePath = $env:PSModulePath + ';#{vendor_path}'
[System.Environment]::SetEnvironmentVariable('PSModulePath', $MungedPSModulePath, [System.EnvironmentVariableTarget]::Machine)
Set-ItemProperty -Path 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name 'PSModulePath' -Value $MungedPSModulePath
$env:PSModulePath = [System.Environment]::GetEnvironmentVariable('PSModulePath','machine')
MUNGE_PSMODULEPATH
end
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/dsc_base_provider/invoke_dsc_resource_postscript.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Try {
} Finally {
If (![string]::IsNullOrEmpty($UnmungedPSModulePath)) {
# Reset the PSModulePath
[System.Environment]::SetEnvironmentVariable('PSModulePath', $UnmungedPSModulePath, [System.EnvironmentVariableTarget]::Machine)
Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' -Name 'PSModulePath' -Value $UnmungedPSModulePath
$env:PSModulePath = [System.Environment]::GetEnvironmentVariable('PSModulePath', 'machine')
}
}
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/puppet/provider/dsc_base_provider/dsc_base_provider_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,7 @@
end

it 'updates the system PSModulePath to $MungedPSModulePath' do
expect(result).to match(/SetEnvironmentVariable\('PSModulePath', \$MungedPSModulePath/)
expect(result).to match(/-Name 'PSModulePath' -Value \$MungedPSModulePath/)
end

it 'sets the process level PSModulePath to the modified system PSModulePath' do
Expand Down