diff options
Diffstat (limited to 'coin/provisioning/common/windows/vc_redist.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/vc_redist.ps1 | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index 4a8376b6..c356ca2c 100644 --- a/coin/provisioning/common/windows/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 @@ -32,21 +32,18 @@ ## ############################################################################# -param([Int32]$archVer=32) . "$PSScriptRoot\helpers.ps1" # This script installs Visual C++ Redistributable for Visual Studio 2015 # This is a dependency of the current python3 version -# check bit version -if ( $archVer -eq 64 ) { - echo "Running in 64 bit system" +if (Is64BitWinHost) { + Write-Host "Running in 64 bit system" $arch = "x64" $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x64.exe" $sha1 = "3155cb0f146b927fcc30647c1a904cd162548c8c" -} -else { +} else { $arch = "x86" $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x86.exe" @@ -55,10 +52,10 @@ else { $package = "C:\Windows\temp\vc_redist.$arch.exe" -echo "Fetching from URL..." +Write-Host "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 -echo "Installing $package..." -Start-Process -FilePath $package -ArgumentList "/q" -Wait -echo "Remove $package..." -del $package +Write-Host "Installing $package..." +Run-Executable $package "/q" +Write-Host "Remove $package..." +Remove-Item -Force -Path $package |