diff options
Diffstat (limited to 'coin/provisioning/common/windows/install-git.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/install-git.ps1 | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/coin/provisioning/common/windows/install-git.ps1 b/coin/provisioning/common/windows/install-git.ps1 index 00700a22..c57e7199 100644 --- a/coin/provisioning/common/windows/install-git.ps1 +++ b/coin/provisioning/common/windows/install-git.ps1 @@ -35,11 +35,10 @@ # Install Git version 2.13.0 $version = "2.13.0" -if( (is64bitWinHost) -eq 1 ) { +if (Is64BitWinHost) { $arch = "-64-bit" $sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7" -} -else { +} else { $arch = "-32-bit" $sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec" } @@ -47,11 +46,11 @@ $gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe" $url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + $arch + ".exe" -echo "Fetching Git $version..." +Write-Host "Fetching Git $version..." Download $url_official $url_cache $gitPackage Verify-Checksum $gitPackage $sha1 -echo "Installing Git $version..." -cmd /c "$gitPackage /SILENT /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh"" -remove-item $gitPackage +Write-Host "Installing Git $version..." +Run-Executable "$gitPackage" "/SILENT /COMPONENTS=`"icons,ext\reg\shellhere,assoc,assoc_sh`"" +Remove-Item -Path $gitPackage -echo "Git = $version" >> ~\versions.txt +Write-Output "Git = $version" >> ~\versions.txt |