diff options
| author | Joni Jäntti <joni.jantti@qt.io> | 2017-09-20 09:13:26 +0300 |
|---|---|---|
| committer | Joni Jäntti <joni.jantti@qt.io> | 2017-10-17 16:57:15 +0000 |
| commit | 4cdfd8e902493b82dc8c140c9a5d5163106731d8 (patch) | |
| tree | db5a3d21c817d603869ed651704b4d7245a1b827 /coin | |
| parent | e8fc2166582da87ea7c6da06064f9ccf45e0e409 (diff) | |
Make 7zip provisioning script add 7zip to path
7zip is nice to have in path for future purposes such as when
cherry-picking to other branches where we use different
extracts scripts.
Change-Id: I40b0f8568e285d85927ad30365c0ab9224e21332
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/provisioning/common/install-sevenzip.ps1 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1 index 1db41cc1..5f19543f 100644 --- a/coin/provisioning/common/install-sevenzip.ps1 +++ b/coin/provisioning/common/install-sevenzip.ps1 @@ -35,7 +35,8 @@ # This script installs 7-Zip -$version = "1604" +$version = "16.04" +$nonDottedVersion = "1604" if( (is64bitWinHost) -eq 1 ) { $arch = "-x64" @@ -46,15 +47,18 @@ else { $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4" } -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe" -$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe" -$7zPackage = "C:\Windows\Temp\7zip-$version.exe" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $nonDottedVersion + $arch + ".exe" +$url_official = "http://www.7-zip.org/a/7z" + $nonDottedVersion + $arch + ".exe" +$7zPackage = "C:\Windows\Temp\7zip-$nonDottedVersion.exe" +$7zTargetLocation = "C:\Utils\sevenzip\" Download $url_official $url_cache $7zPackage Verify-Checksum $7zPackage $sha1 -cmd /c "$7zPackage /S /D=C:\Utils\sevenzip\" +Start-Process -FilePath $7zPackage -ArgumentList "/S","/D=$7zTargetLocation" -Wait echo "Cleaning $7zPackage.." Remove-Item -Recurse -Force "$7zPackage" +Add-Path $7zTargetLocation + echo "7-Zip = $version" >> ~\versions.txt |