Merge branch 'master' into fftw

1 files changed, 30 insertions, 24 deletions

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index d32c3ae6b..e394e540e 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -11,19 +11,25 @@ function vcpkgCreateDirectoryIfNotExists([Parameter(Mandatory=$true)][string]$di
     }
 }
 
-function vcpkgRemoveDirectory([Parameter(Mandatory=$true)][string]$dirPath)
+function vcpkgCreateParentDirectoryIfNotExists([Parameter(Mandatory=$true)][string]$path)
 {
-    if (Test-Path $dirPath)
+    $parentDir = split-path -parent $path
+    if ([string]::IsNullOrEmpty($parentDir))
     {
-        Remove-Item $dirPath -Recurse -Force
+        return
+    }
+
+    if (!(Test-Path $parentDir))
+    {
+        New-Item -ItemType Directory -Path $parentDir | Out-Null
     }
 }
 
-function vcpkgRemoveFile([Parameter(Mandatory=$true)][string]$filePath)
+function vcpkgRemoveItem([Parameter(Mandatory=$true)][string]$dirPath)
 {
-    if (Test-Path $filePath)
+    if (Test-Path $dirPath)
     {
-        Remove-Item $filePath -Force
+        Remove-Item $dirPath -Recurse -Force
     }
 }
 
@@ -101,11 +107,10 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
         return
     }
 
-    $downloadDir = split-path -parent $downloadPath
-    vcpkgCreateDirectoryIfNotExists $downloadDir
+    vcpkgCreateParentDirectoryIfNotExists $downloadPath
 
     $downloadPartPath = "$downloadPath.part"
-    vcpkgRemoveFile $downloadPartPath
+    vcpkgRemoveItem $downloadPartPath
 
     $wc = New-Object System.Net.WebClient
     $proxyAuth = !$wc.Proxy.IsBypassed($url)
@@ -131,7 +136,7 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
         catch [System.Exception]
         {
             # If BITS fails for any reason, delete any potentially partially downloaded files and continue
-            vcpkgRemoveFile $downloadPartPath
+            vcpkgRemoveItem $downloadPartPath
         }
     }
 
@@ -141,16 +146,21 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
 }
 
 function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$file,
-                            [Parameter(Mandatory=$true)][string]$destinationDir)
+                            [Parameter(Mandatory=$true)][string]$destinationDir,
+                            [Parameter(Mandatory=$true)][string]$outFilename)
 {
-    $parentPath = split-path -parent $destinationDir
-    vcpkgCreateDirectoryIfNotExists $parentPath
-    $baseName = (Get-ChildItem $file).BaseName
-    $destinationPartial = "$destinationDir\$baseName-partially_extracted"
+    vcpkgCreateDirectoryIfNotExists $destinationDir
+    $output = "$destinationDir\$outFilename"
+    vcpkgRemoveItem $output
+    $destinationPartial = "$destinationDir\partially-extracted"
 
-    vcpkgRemoveDirectory $destinationPartial
+    vcpkgRemoveItem $destinationPartial
     vcpkgCreateDirectoryIfNotExists $destinationPartial
 
+    $shell = new-object -com shell.application
+    $zip = $shell.NameSpace($file)
+    $itemCount = $zip.Items().Count
+
     if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Archive\Expand-Archive')
     {
         Write-Verbose("Extracting with Microsoft.PowerShell.Archive\Expand-Archive")
@@ -164,8 +174,6 @@ function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$file,
     else
     {
         Write-Verbose("Extracting via shell")
-        $shell = new-object -com shell.application
-        $zip = $shell.NameSpace($file)
         foreach($item in $zip.items())
         {
             # Piping to Out-Null is used to block until finished
@@ -173,16 +181,14 @@ function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$file,
         }
     }
 
-    $hasASingleItem = (Get-ChildItem $destinationPartial | Measure-Object).Count -eq 1;
-
-    if ($hasASingleItem)
+    if ($itemCount -eq 1)
     {
-        Move-Item -Path "$destinationPartial\*" -Destination $destinationDir
-        vcpkgRemoveDirectory $destinationPartial
+        Move-Item -Path "$destinationPartial\*" -Destination $output
+        vcpkgRemoveItem $destinationPartial
     }
     else
     {
-        Rename-Item -Path $destinationPartial -NewName $baseName
+        Move-Item -Path $destinationPartial -Destination $output
     }
 }