diff options
| author | Joni Jäntti <joni.jantti@qt.io> | 2017-08-25 09:02:36 +0300 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-30 17:16:56 +0000 |
| commit | c7a9bb92e1ed46464a38006832a010a719290779 (patch) | |
| tree | f623ece252ba156d906697bc9cd5419831c3cc22 | |
| parent | 835ef953f026dcad106b9fe00e1504f4526d5a08 (diff) | |
Fix adding to path lines for Windows provisioning scripts
Currently the path addition command will forget the previous addition
when adding a new string. This hasn't been found out because python
was the only script using this command. Now we also need to set the
path for ruby, so the python string is left out.
Change-Id: I39721d78111550189e52a9f095030033f9660c0a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
| -rw-r--r-- | coin/provisioning/common/install-ruby.ps1 | 3 | ||||
| -rw-r--r-- | coin/provisioning/common/python.ps1 | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 332a3a89..be0bc3eb 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -48,4 +48,7 @@ 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) + echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 6c88689a..29114456 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -62,7 +62,9 @@ echo "Chancing allowZip64 value to 'True'..." (Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py echo "Remove $package..." del $package -[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) + +$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) C:\Python27\python.exe -m ensurepip # Install python virtual env |