mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 02:57:09 +01:00
Merge pull request #1141 from Mixaill/pscore-bootstrap
scripts/fetchDependency.ps1: fix vcpkg boostrapping with Powershell Core
This commit is contained in:
commit
9db43574c9
@ -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,10 +197,17 @@ 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 $_})
|
||||
if ($PSVersionTable.PSEdition -eq "Desktop")
|
||||
{
|
||||
$hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA256")
|
||||
$fileAsByteArray = [io.File]::ReadAllBytes($downloadPath)
|
||||
$hashByteArray = $hashAlgorithm.ComputeHash($fileAsByteArray)
|
||||
$downloadedFileHash = -Join ($hashByteArray | ForEach {"{0:x2}" -f $_})
|
||||
}
|
||||
else
|
||||
{
|
||||
$downloadedFileHash = (Get-FileHash -Path $downloadPath -Algorithm SHA256).Hash
|
||||
}
|
||||
|
||||
if ($expectedDownloadedFileHash -ne $downloadedFileHash)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user