Merge 4de2ef7d8d into 82c7e631bb
This commit is contained in:
commit
b03f11f291
|
|
@ -9872,11 +9872,12 @@ function extractZipWin(file, dest) {
|
||||||
yield exec_1.exec(`"${pwshPath}"`, args);
|
yield exec_1.exec(`"${pwshPath}"`, args);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
//attempt to use pwsh with ExtractToDirectory, if this fails attempt Expand-Archive
|
||||||
const powershellCommand = [
|
const powershellCommand = [
|
||||||
`$ErrorActionPreference = 'Stop' ;`,
|
`$ErrorActionPreference = 'Stop' ;`,
|
||||||
`try { Add-Type -AssemblyName System.IO.Compression.FileSystem } catch { } ;`,
|
`try { Add-Type -AssemblyName System.IO.Compression.FileSystem } catch { } ;`,
|
||||||
`if ((Get-Command -Name Expand-Archive -Module Microsoft.PowerShell.Archive -ErrorAction Ignore)) { Expand-Archive -LiteralPath '${escapedFile}' -DestinationPath '${escapedDest}' -Force }`,
|
`try { [System.IO.Compression.ZipFile]::ExtractToDirectory('${escapedFile}', '${escapedDest}', $true) }`,
|
||||||
`else {[System.IO.Compression.ZipFile]::ExtractToDirectory('${escapedFile}', '${escapedDest}', $true) }`
|
`catch { if (($_.Exception.GetType().FullName -eq 'System.Management.Automation.MethodException') -or ($_.Exception.GetType().FullName -eq 'System.Management.Automation.RuntimeException') ){ Expand-Archive -LiteralPath '${escapedFile}' -DestinationPath '${escapedDest}' -Force } else { throw $_ } } ;`
|
||||||
].join(' ');
|
].join(' ');
|
||||||
const args = [
|
const args = [
|
||||||
'-NoLogo',
|
'-NoLogo',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue