diff options
Diffstat (limited to 'coin/provisioning/common/windows/python3.ps1')
-rw-r--r-- | coin/provisioning/common/windows/python3.ps1 | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 23ddb553..0ea93133 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -32,7 +32,6 @@ ## ############################################################################# -param([Int32]$archVer=32) . "$PSScriptRoot\helpers.ps1" # This script installs Python $version. @@ -43,32 +42,31 @@ $package = "C:\Windows\temp\python-$version.exe" $install_path = "C:\Python36" # check bit version -if ( $archVer -eq 64 ) { - echo "Running in 64 bit system" +if (Is64BitWinHost) { + Write-Host "Running in 64 bit system" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe" $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" -} -else { +} else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe" $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" } -echo "Fetching from URL..." +Write-Host "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 -echo "Installing $package..." -cmd /c "$package /q TargetDir=$install_path" -echo "Remove $package..." -del $package +Write-Host "Installing $package..." +Run-Executable "$package" "/q TargetDir=$install_path" +Write-Host "Remove $package..." +Remove-Item -Path $package -[Environment]::SetEnvironmentVariable("PYTHON3_PATH", "$install_path", [EnvironmentVariableTarget]::Machine) -[Environment]::SetEnvironmentVariable("PIP3_PATH", "$install_path\Scripts", [EnvironmentVariableTarget]::Machine) +Set-EnvironmentVariable "PYTHON3_PATH" "$install_path" +Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts" # Install python virtual env -#if ( isProxyEnabled ) { -# echo "Using proxy with pip" +#if (isProxyEnabled) { +# Write-Host "Using proxy with pip" # $pip_args = "--proxy=" + (getProxy) #} -cmd /c "$install_path\Scripts\pip3.exe install virtualenv" +Run-Executable "$install_path\Scripts\pip3.exe" "install virtualenv" |