diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
| commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
| tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/provisioning/common/helpers.ps1 | |
| parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
| parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to 'coin/provisioning/common/helpers.ps1')
| -rw-r--r-- | coin/provisioning/common/helpers.ps1 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index d901e370..f6a9fd90 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -28,7 +28,10 @@ function Extract-7Zip if (-not (test-path $zipExe)) { $zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe' if (-not (test-path $zipExe)) { - throw "Could not find 7-zip." + $zipExe = "C:\Utils\sevenzip\7z.exe" + if (-not (test-path $zipExe)) { + throw "Could not find 7-zip." + } } } } else { |