From 5eae1a3a311c8d897209ea48d35f7cd5a950deba Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 12 Jun 2017 09:31:09 -0700 Subject: [PATCH] Fixing logic; variable name. --- scripts/obtain/dotnet-install.ps1 | 2 +- scripts/obtain/dotnet-install.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index 124db144e..8db843a58 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -261,7 +261,7 @@ function Get-Download-Link([string]$AzureFeed, [string]$Channel, [string]$Specif return $PayloadURL } -function Get-LegacytDownload-Link([string]$AzureFeed, [string]$Channel, [string]$SpecificVersion, [string]$CLIArchitecture) { +function Get-LegacyDownload-Link([string]$AzureFeed, [string]$Channel, [string]$SpecificVersion, [string]$CLIArchitecture) { Say-Invocation $MyInvocation if ($SharedRuntime) { diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index eaea0dca6..8697816e7 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -601,7 +601,7 @@ downloadwget() { calculate_vars() { eval $invocation - valid_legacy_download_link=false + valid_legacy_download_link=true normalized_architecture=$(get_normalized_architecture_from_architecture "$architecture") say_verbose "normalized_architecture=$normalized_architecture" @@ -616,9 +616,10 @@ calculate_vars() { download_link=$(construct_download_link $azure_feed $channel $normalized_architecture $specific_version) say_verbose "download_link=$download_link" - if [ legacy_download_link=$(construct_legacy_download_link $azure_feed $channel $normalized_architecture $specific_version) ]; then + legacy_download_link=$(construct_legacy_download_link $azure_feed $channel $normalized_architecture $specific_version) || valid_legacy_download_link=false + + if [ "$valid_legacy_download_link" = true ]; then say_verbose "legacy_download_link=$legacy_download_link" - valid_legacy_download_link=true else say_verbose "Cound not construct a legacy_download_link; omitting..." fi