diff options
| author | Joni Jäntti <joni.jantti@qt.io> | 2017-09-04 13:25:44 +0300 |
|---|---|---|
| committer | Joni Jäntti <joni.jantti@qt.io> | 2017-09-04 12:11:17 +0000 |
| commit | dbf737a5c098ffe5c38413c2f289790d87ec6131 (patch) | |
| tree | 8a558100b84bc96e1bd42b1efc2615d36a65b9b9 /coin | |
| parent | 4e1f4665c5ed631e18d2fa4910fd1a612b40539a (diff) | |
Fix Add-Path helper function and start using it in scripts
This function was broken and only added the latest addition to the
actual PATH.
Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/provisioning/common/cmake.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/helpers.ps1 | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/install-ruby.ps1 | 3 | ||||
| -rw-r--r-- | coin/provisioning/common/python.ps1 | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 50e2e82c..8a94dc5d 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -53,5 +53,7 @@ if((Test-Path -Path "C:\CMake" )){ $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" Rename-Item $defaultinstallfolder C:\CMake +Add-Path "C:\CMake\bin" + echo "CMake = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 3f7f0a68..846f58a5 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -86,7 +86,9 @@ function Add-Path [string]$Path ) echo "Adding $Path to Path" - [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine) + + $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine) } function is64bitWinHost diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 81b01342..57cf227f 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -55,7 +55,6 @@ cmd /c "$rubyPackage /silent" echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" -$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') -[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Ruby22-x64\bin" echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 0be96eef..c3eba2d8 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -59,8 +59,7 @@ echo "Chancing allowZip64 value to 'True'..." echo "Remove $package..." del $package -$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') -[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Python27;C:\Python27\Scripts" C:\Python27\python.exe -m ensurepip # Install python virtual env |