diff options
Diffstat (limited to 'scripts/VcpkgPowershellUtils.ps1')
| -rw-r--r-- | scripts/VcpkgPowershellUtils.ps1 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1 index c7447b383..12eacec96 100644 --- a/scripts/VcpkgPowershellUtils.ps1 +++ b/scripts/VcpkgPowershellUtils.ps1 @@ -144,16 +144,20 @@ function vcpkgExtractFile( [Parameter(Mandatory=$true)][string]$file, [Parameter(Mandatory=$true)][string]$destination) { vcpkgCreateDirectory $destination + $baseName = (Get-ChildItem .\downloads\cmake-3.9.5-win32-x86.zip).BaseName + $destinationPartial = "$destination\$baseName-partially_extracted" + vcpkgRemoveDirectory $destinationPartial + vcpkgCreateDirectory $destinationPartial if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Archive\Expand-Archive') { Write-Verbose("Extracting with Microsoft.PowerShell.Archive\Expand-Archive") - Microsoft.PowerShell.Archive\Expand-Archive -path $file -destinationpath $destination + Microsoft.PowerShell.Archive\Expand-Archive -path $file -destinationpath $destinationPartial } elseif (vcpkgHasCommand -commandName 'Pscx\Expand-Archive') { Write-Verbose("Extracting with Pscx\Expand-Archive") - Pscx\Expand-Archive -path $file -OutputPath $destination + Pscx\Expand-Archive -path $file -OutputPath $destinationPartial } else { @@ -163,9 +167,12 @@ function vcpkgExtractFile( [Parameter(Mandatory=$true)][string]$file, foreach($item in $zip.items()) { # Piping to Out-Null is used to block until finished - $shell.Namespace($destination).copyhere($item) | Out-Null + $shell.Namespace($destinationPartial).copyhere($item) | Out-Null } } + + Move-Item -Path "$destinationPartial\*" -Destination $destination + vcpkgRemoveDirectory $destinationPartial } function vcpkgInvokeCommand() |