diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-25 08:57:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-25 08:57:06 +0200 |
commit | 892b1977c586c2364f54866115a665df2193d6e8 (patch) | |
tree | 931adafe9b4117463b2b0c52feaa25e4c18a2a40 /coin/provisioning/common/install-ruby.ps1 | |
parent | 90ddfaf35f293e0ec6f27f78b9a50509b24066f8 (diff) | |
parent | 51c26733040d94cb62b6f1d2df32da7ebe80d842 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
Diffstat (limited to 'coin/provisioning/common/install-ruby.ps1')
-rw-r--r-- | coin/provisioning/common/install-ruby.ps1 | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index be0bc3eb..57cf227f 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -36,10 +36,17 @@ # This script will install Ruby $version = "2.2.6" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + "-x64.exe" -$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + "-x64.exe" +if( (is64bitWinHost) -eq 1 ) { + $arch = "-x64" + $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" +} +else { + $arch = "" + $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe" +$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe" $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe" -$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" Download $url_official $url_cache $rubyPackage Verify-Checksum $rubyPackage $sha1 @@ -48,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 |