diff options
| author | Mikhail Paulyshka <me@mixaill.tk> | 2017-05-22 23:57:37 +0300 |
|---|---|---|
| committer | Mikhail Paulyshka <me@mixaill.tk> | 2017-05-22 23:57:37 +0300 |
| commit | 932f0f0657767c26687dcad81311d4badc56348b (patch) | |
| tree | 13ed07fa2566f5f98e7f973a58a1a9a816e60dde /scripts | |
| parent | fb689bd13dd6ba563a885d71fff1dd2b32a615db (diff) | |
| download | vcpkg-932f0f0657767c26687dcad81311d4badc56348b.tar.gz vcpkg-932f0f0657767c26687dcad81311d4badc56348b.zip | |
scripts/fetchDependency.ps1: fix vcpkg boostrapping with Powershell Core
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fetchDependency.ps1 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index 98144bffa..bbc027861 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -9,7 +9,9 @@ $downloadPromptOverride_NO_OVERRIDE= 0 $downloadPromptOverride_DO_NOT_PROMPT = 1 $downloadPromptOverride_ALWAYS_PROMPT = 2 -Import-Module BitsTransfer -Verbose:$false +if ($PSVersionTable.PSEdition -eq "Desktop") { + Import-Module BitsTransfer -Verbose:$false +} Write-Verbose "Fetching dependency: $Dependency" @@ -80,7 +82,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) New-Item -ItemType directory -Path $downloadDir | Out-Null } - if ($Dependency -ne "git") # git fails with BITS + if (($PSVersionTable.PSEdition -eq "Desktop") -and ($Dependency -ne "git")) # git fails with BITS { try { $WC = New-Object System.Net.WebClient @@ -195,11 +197,8 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) performDownload $Dependency $url $downloadsDir $downloadPath $downloadVersion $requiredVersion #calculating the hash - $hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA256") - $fileAsByteArray = [io.File]::ReadAllBytes($downloadPath) - $hashByteArray = $hashAlgorithm.ComputeHash($fileAsByteArray) - $downloadedFileHash = -Join ($hashByteArray | ForEach {"{0:x2}" -f $_}) - + $downloadedFileHash = (Get-FileHash -Path $downloadPath -Algorithm SHA256).Hash + if ($expectedDownloadedFileHash -ne $downloadedFileHash) { throw [System.IO.FileNotFoundException] ("Mismatching hash of the downloaded " + $Dependency) |