Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 1ded4f1

Browse files
author
John Beisner
committed
Forcing 'curl' to return an usable exitcode.
1 parent 6222e66 commit 1ded4f1

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

scripts/obtain/dotnet-install.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ check_pre_reqs() {
193193

194194
[ -z "$($LDCONFIG_COMMAND -p | grep libunwind)" ] && say_err "Unable to locate libunwind. Install libunwind to continue" && failing=true
195195
[ -z "$($LDCONFIG_COMMAND -p | grep libssl)" ] && say_err "Unable to locate libssl. Install libssl to continue" && failing=true
196-
[ -z "$($LDCONFIG_COMMAND -p | grep libcurl)" ] && say_err "Unable to locate libcurl. Install libcurl to continue" && failing=true
197196
[ -z "$($LDCONFIG_COMMAND -p | grep libicu)" ] && say_err "Unable to locate libicu. Install libicu to continue" && failing=true
198197
fi
199198

@@ -571,9 +570,9 @@ downloadcurl() {
571570

572571
local failed=false
573572
if [ -z "$out_path" ]; then
574-
curl --retry 10 -sSL --create-dirs $remote_path || failed=true
573+
curl --retry 10 -sSL -f --create-dirs $remote_path || failed=true
575574
else
576-
curl --retry 10 -sSL --create-dirs -o $out_path $remote_path || failed=true
575+
curl --retry 10 -sSL -f --create-dirs -o $out_path $remote_path || failed=true
577576
fi
578577
if [ "$failed" = true ]; then
579578
say_verbose "Curl download failed"
@@ -638,15 +637,15 @@ install_dotnet() {
638637
zip_path=$(mktemp $temporary_file_template)
639638
say_verbose "Zip path: $zip_path"
640639

641-
say "Downloading $download_link"
640+
say "Downloading link: $download_link"
642641
download "$download_link" $zip_path || download_failed=true
643642

644643
# if the download fails, download the alt_download_link [Linux only]
645644
if [ "$(uname)" = "Linux" ] && [ "$download_failed" = true ]; then
646-
say "Cannot download $download_link"
645+
say "Cannot download: $download_link"
647646
zip_path=$(mktemp $temporary_file_template)
648647
say_verbose "Alternate zip path: $zip_path"
649-
say "Downloading alternate: $alt_download_link"
648+
say "Downloading alternate link: $alt_download_link"
650649
download "$alt_download_link" $zip_path
651650
fi
652651

0 commit comments

Comments
 (0)