From c4caf29213f54b1786102c1b4dc085b6d7142998 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 30 Apr 2018 19:08:34 -0700
Subject: [vcpkg] Fix temporary download directory when vcpkg is located at the
 root of a drive

---
 scripts/VcpkgPowershellUtils.ps1 | 17 ++++++++++++++---
 scripts/fetchTool.ps1            |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index fdd89e7b9..3ea18116b 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -89,7 +89,13 @@ function vcpkgGetSHA512([Parameter(Mandatory=$true)][string]$filePath)
     if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Utility\Get-FileHash')
     {
         Write-Verbose("Hashing with Microsoft.PowerShell.Utility\Get-FileHash")
-        $hash = (Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA512).Hash
+        $hashresult = Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA512 -ErrorVariable hashError
+        if ($hashError)
+        {
+            Start-Sleep 3
+            $hashresult = Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA512 -ErrorVariable Stop
+        }
+        $hash = $hashresult.Hash
     }
     elseif(vcpkgHasCommand -commandName 'Pscx\Get-Hash')
     {
@@ -177,7 +183,7 @@ function vcpkgDownloadFileWithAria2(    [Parameter(Mandatory=$true)][string]$ari
         return
     }
 
-    $ec = vcpkgInvokeCommand "$aria2exe" "--dir `"$parentDir`" --out `"$filename.part`" $url"
+    $ec = vcpkgInvokeCommand "$aria2exe" "--dir=`"$parentDir`" --out=`"$filename.part`" $url"
     if ($ec -ne 0)
     {
         Write-Host "Could not download $url"
@@ -202,7 +208,12 @@ function vcpkgExtractFileWith7z([Parameter(Mandatory=$true)][string]$sevenZipExe
         Write-Host "Could not extract $archivePath"
         throw
     }
-    Rename-Item -Path "$destinationPartial" -NewName $destinationDir
+    Rename-Item -Path "$destinationPartial" -NewName $destinationDir -ErrorVariable renameResult
+    if ($renameResult)
+    {
+        Start-Sleep 3
+        Rename-Item -Path "$destinationPartial" -NewName $destinationDir -ErrorAction Stop
+    }
 }
 
 function vcpkgExtractZipFile(  [Parameter(Mandatory=$true)][string]$archivePath,
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index dd3f0f9f4..eca405b62 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -4,6 +4,7 @@ param(
 )
 
 Set-StrictMode -Version Latest
+
 $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
 . "$scriptsDir\VcpkgPowershellUtils.ps1"
 
@@ -12,6 +13,7 @@ $vcpkgRootDir = vcpkgFindFileRecursivelyUp $scriptsDir .vcpkg-root
 
 $downloadsDir = "$vcpkgRootDir\downloads"
 vcpkgCreateDirectoryIfNotExists $downloadsDir
+$downloadsDir = Resolve-Path $downloadsDir
 
 function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
 {
-- 
cgit v1.2.3