diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2018-10-19 09:24:25 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-07 20:07:36 +0000 |
| commit | 1248a6787de3f545aa96fb4dc402713cdd568e6b (patch) | |
| tree | a89af7526963cc72f268c513122752b9c96152d9 /coin/provisioning/common/windows/install-git.ps1 | |
| parent | 1bd6aab2089550c235b40487717fbdc3c60b6fdc (diff) | |
Provisioning: Add scp and ssh location in the PATH for Windows
RTA needs to have these on the PATH
Change-Id: I59694737e9284bc31eefcc4ff89219665c2aa430
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows/install-git.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/install-git.ps1 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/install-git.ps1 b/coin/provisioning/common/windows/install-git.ps1 index c57e7199..110c3703 100644 --- a/coin/provisioning/common/windows/install-git.ps1 +++ b/coin/provisioning/common/windows/install-git.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -51,6 +51,8 @@ Download $url_official $url_cache $gitPackage Verify-Checksum $gitPackage $sha1 Write-Host "Installing Git $version..." Run-Executable "$gitPackage" "/SILENT /COMPONENTS=`"icons,ext\reg\shellhere,assoc,assoc_sh`"" -Remove-Item -Path $gitPackage +Write-Host "Adding SSH and SCP to environment variables for RTA" +Set-EnvironmentVariable "SSH" "C:\Program Files\Git\usr\bin\ssh.exe" +Set-EnvironmentVariable "SCP" "C:\Program Files\Git\usr\bin\scp.exe" Write-Output "Git = $version" >> ~\versions.txt |