diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-04-04 22:13:12 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-04-06 17:24:46 -0700 |
| commit | 5b78dfaf68d33c2444437f92d253d7fa912152ec (patch) | |
| tree | d7a21a6b68b49bb951a42654d36414ced8555809 /scripts | |
| parent | b217246f70fd6ac8f8d093b4457ae9035a2dd954 (diff) | |
| download | vcpkg-5b78dfaf68d33c2444437f92d253d7fa912152ec.tar.gz vcpkg-5b78dfaf68d33c2444437f92d253d7fa912152ec.zip | |
[fetchTool] Extract aria2 with shell
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fetchTool.ps1 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1 index 55d04ec98..c076d304a 100644 --- a/scripts/fetchTool.ps1 +++ b/scripts/fetchTool.ps1 @@ -48,8 +48,8 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool) { Write-Host "Downloading $tool..." - # aria2 needs 7zip & 7zip920 to extract. So, we need to download those trough powershell - if ($tool -eq "aria2" -or $tool -eq "7zip" -or $tool -eq "7zip920") + # Download aria2 with .NET. aria2 will be used to download everything else. + if ($tool -eq "aria2") { vcpkgDownloadFile $url $downloadPath } @@ -69,7 +69,9 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool) if ($isArchive) { Write-Host "Extracting $tool..." - if ($tool -eq "7zip920") + # Extract 7zip920 with shell because we need it to extract 7zip + # Extract aria2 with shell because we need it to download 7zip + if ($tool -eq "7zip920" -or $tool -eq "aria2") { vcpkgExtractZipFileWithShell -ArchivePath $downloadPath -DestinationDir $toolPath } |
