Skip to content

tools: fix install-powershell for running during window setup #5727

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
TravisEz13 merged 3 commits into from
Jan 2, 2018
Merged

tools: fix install-powershell for running during window setup #5727

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0a2f37
change to update machine path
TravisEz13 Dec 20, 2017
f1d657d
force creation of destination's parent if it does not exist
TravisEz13 Dec 20, 2017
cd04c52
address PR comments
TravisEz13 Dec 21, 2017
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
11 changes: 6 additions & 5 deletions tools/install-powershell.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ try {
Copy-Item $_.fullname -Destination $DestinationFilePath
}
} else {
$null = New-Item -Path (Split-Path -Path $Destination -Parent) -ItemType Directory -ErrorAction SilentlyContinue
Move-Item -Path $contentPath -Destination $Destination
}

Expand All @@ -173,11 +174,11 @@ try {
if (-not $IsWinEnv) { chmod 755 $Destination/pwsh }

if ($AddToPath) {
if ($IsWinEnv -and (-not $env:Path.Contains($Destination))) {
## Add to the User scope 'Path' environment variable
$userPath = [System.Environment]::GetEnvironmentVariable("Path", "User")
$userPath = $Destination + [System.IO.Path]::PathSeparator + $userPath
[System.Environment]::SetEnvironmentVariable("Path", $userPath, "User")
if ($IsWinEnv -and (-not [System.Environment]::GetEnvironmentVariable("Path", "Machine").Contains($Destination))) {
## Add to the Machine scope 'Path' environment variable
$machinePath = [System.Environment]::GetEnvironmentVariable("Path", "Machine")
$machinePath = $Destination + [System.IO.Path]::PathSeparator + $machinePath
[System.Environment]::SetEnvironmentVariable("Path", $machinePath, "Machine")
Write-Verbose "'$Destination' is added to the Path" -Verbose
}

Expand Down