diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
| commit | 1099b1ddcef203df81d4d19cecba8b2813d413d7 (patch) | |
| tree | 0abc9f9cee5fa597a8d8bb3ebf64cd9ba6b9d06e /coin/provisioning/common/install-ruby.ps1 | |
| parent | cdab32be2368ffd234c9ace4233916cfc3682563 (diff) | |
| parent | 9a096e6841e38c79fa3c81036e5d8c5b1e792e5c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
Diffstat (limited to 'coin/provisioning/common/install-ruby.ps1')
| -rw-r--r-- | coin/provisioning/common/install-ruby.ps1 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 332a3a89..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,4 +55,6 @@ cmd /c "$rubyPackage /silent" echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" +Add-Path "C:\Ruby22-x64\bin" + echo "Ruby = $version" >> ~\versions.txt |