From c3fb0b169751ec0f25ac3752a7e83e21173073a4 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 22 Mar 2018 03:08:25 -0700
Subject: [vcpkg] Download cmake on osx and linux

---
 scripts/fetchTool.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts/fetchTool.ps1')

diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 2c2f599ef..86174ee19 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -35,14 +35,14 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
     $isArchive = vcpkgHasProperty -object $toolData -propertyName "archiveRelativePath"
     if ($isArchive)
     {
-        $downloadPath = "$downloadsDir\$($toolData.archiveRelativePath)"
+        $downloadPath = "$downloadsDir\$(@($toolData.archiveRelativePath)[0])"
     }
     else
     {
-        $downloadPath = "$downloadsDir\$($toolData.exeRelativePath)"
+        $downloadPath = "$downloadsDir\$(@($toolData.exeRelativePath)[0])"
     }
 
-    $url = $toolData.url
+    [String]$url = @($toolData.url)[0]
     if (!(Test-Path $downloadPath))
     {
         Write-Host "Downloading $tool..."
@@ -50,7 +50,7 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         Write-Host "Downloading $tool has completed successfully."
     }
 
-    $expectedDownloadedFileHash = $toolData.sha256
+    $expectedDownloadedFileHash = @($toolData.sha256)[0]
     $downloadedFileHash = vcpkgGetSHA256 $downloadPath
     vcpkgCheckEqualFileHash -filePath $downloadPath -expectedHash $expectedDownloadedFileHash -actualHash $downloadedFileHash
 
-- 
cgit v1.2.3


From 637c9bc0f012e402f5cff5e5f9ac1ca993f89ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Thu, 22 Mar 2018 22:28:17 +0100
Subject: [vcpkg] Fix setting exePath in fetchTool (#3114)

---
 scripts/fetchTool.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/fetchTool.ps1')

diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 86174ee19..ff9b5d9bf 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -25,7 +25,7 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         throw "Unkown tool $tool"
     }
 
-    $exePath = "$downloadsDir\$($toolData.exeRelativePath)"
+    $exePath = "$downloadsDir\$(@($toolData.exeRelativePath)[0])"
 
     if (Test-Path $exePath)
     {
-- 
cgit v1.2.3