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>
This commit is contained in:
Joni Jäntti
2017-09-19 13:50:09 +03:00
parent e09dc71d25
commit e8fc216658

View File

@@ -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 {