mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 20:03:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use temp-and-rename pattern for extracting

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-11-16 02:01:50 -08:00
parent 52ef8c7280
commit b2e1dc3e5a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/VcpkgPowershellUtils.ps1
View File

@ -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()

2
scripts/fetchDependency.ps1
View File

@ -89,7 +89,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
}
elseif($extractionType -eq $ExtractionType_ZIP)
{
if (-not (Test-Path $executableFromDownload)) # consider renaming the extraction folder to make sure the extraction finished
if (-not (Test-Path $executableFromDownload))
{
vcpkgExtractFile -File $downloadPath -Destination $extractionFolder
}