Skip to content

Fix Add-MachinePath to preserve registry value type and unexpanded variables #819

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

Open
wants to merge 3 commits into
base: latestw_all
Choose a base branch
from
Open

Fix Add-MachinePath to preserve registry value type and unexpanded variables #819

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1893b51
Fix non-ASCII characters in OpenSSHUtils.psm1
emilvissing Nov 13, 2025
e3c37b9
Fix Add-MachinePath to preserve registry value type and unexpanded va…
emilvissing Nov 13, 2025
501a2d4
address comments
emilvissing Nov 13, 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
33 changes: 25 additions & 8 deletions contrib/win32/openssh/OpenSSHUtils.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ function Enable-Privilege {
$type[0]::EnablePrivilege($Privilege, $Disable)
}

Function Add-MachinePath {
function Add-MachinePath {
[CmdletBinding(SupportsShouldProcess=$true, ConfirmImpact="High")]
param
(
Expand All @@ -838,13 +838,30 @@ Function Add-MachinePath {
)

if (Test-Path $FilePath) {
$machinePath = (Get-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH).Path
if (-not ($machinePath.ToLower().Contains("$FilePath;".ToLower()) -or $machinePath.ToLower().Contains("$FilePath\;".ToLower())))
{
$newPath = $FilePath + ’;’ + $machinePath
Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH –Value $newPath
if ((Get-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH).Path -eq $newPath) {
Write-Host "Updated Machine PATH to include OpenSSH directory, restart/re-login required to take effect globally" -ForegroundColor Yellow
$regKey = Get-Item -Path 'HKLM:\System\CurrentControlSet\Control\Session Manager\Environment'
$pathValue = $regKey.GetValue('PATH', '', 'DoNotExpandEnvironmentNames')
$pathType = $regKey.GetValueKind('PATH')

# Normalize for comparison only (expand variables and trim trailing backslash)
$normalizedFilePath = [Environment]::ExpandEnvironmentVariables($FilePath).TrimEnd('\')
$normalizedEntries = $pathValue -split ';' |
Where-Object { -not [string]::IsNullOrWhiteSpace($_) } |
ForEach-Object { [Environment]::ExpandEnvironmentVariables($_.Trim()).TrimEnd('\') }

if ($normalizedEntries.Where({ $_ -ieq $normalizedFilePath }, 'First').Count -eq 0) {
$newPath = $FilePath + ';' + $pathValue

$message = "Need to add the path to the Machine PATH environment variable."
$prompt = "Shall I add '$FilePath' to Machine PATH?"
$description = "Add '$FilePath' to Machine PATH."

if ($PSCmdlet.ShouldProcess($description, $prompt, $message)) {
Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value $newPath -Type $pathType

$verifyValue = (Get-Item -Path 'HKLM:\System\CurrentControlSet\Control\Session Manager\Environment').GetValue('PATH', '', 'DoNotExpandEnvironmentNames')
if ($verifyValue -eq $newPath) {
Write-Host "Updated Machine PATH to include OpenSSH directory, restart/re-login required to take effect globally" -ForegroundColor Yellow
}
}
}
}
Expand Down