aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2017-09-19 13:50:09 +0300
committerJoni Jäntti <joni.jantti@qt.io>2017-10-17 16:57:12 +0000
commite8fc2166582da87ea7c6da06064f9ccf45e0e409 (patch)
tree32b728aef563d0bc36758f510f602c563f193929 /coin
parente09dc71d251014baf1432bb79167510af15e0277 (diff)
Make Extract-7zip helper function work with the new provision location
Changed the helper function for extracting 7z files so that it also supports the new C:\Utils\sevenzip location. Change-Id: I4f2dafc4ccac71e2cd8a3c8148df4888f800484f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/provisioning/common/helpers.ps15
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 {