From 33a8c915e975d97e5580482ee5e97201398920c5 Mon Sep 17 00:00:00 2001 From: Thomas Boop <52323235+thboop@users.noreply.github.com> Date: Tue, 16 Jan 2024 12:10:38 -0500 Subject: [PATCH 1/2] Update externals.sh --- src/Misc/externals.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh index 997d132b4ff..3b1f9d2820a 100755 --- a/src/Misc/externals.sh +++ b/src/Misc/externals.sh @@ -63,14 +63,13 @@ function acquireExternalTool() { echo "Curl version: $CURL_VERSION" # curl -f Fail silently (no output at all) on HTTP errors (H) - # -k Allow connections to SSL sites without certs (H) # -S Show error. With -s, make curl show errors when they occur # -L Follow redirects (H) # -o FILE Write to FILE instead of stdout # --retry 3 Retries transient errors 3 times (timeouts, 5xx) if [[ "$(printf '%s\n' "7.71.0" "$CURL_VERSION" | sort -V | head -n1)" != "7.71.0" ]]; then # Curl version is less than or equal to 7.71.0, skipping retry-all-errors flag - curl -fkSL --retry 3 -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl' + curl -fSL --retry 3 -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl' else # Curl version is greater than 7.71.0, running curl with --retry-all-errors flag curl -fkSL --retry 3 --retry-all-errors -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl' From 71665fd2221f55316f12e8526f9314c262774efa Mon Sep 17 00:00:00 2001 From: Thomas Boop <52323235+thboop@users.noreply.github.com> Date: Tue, 16 Jan 2024 12:11:19 -0500 Subject: [PATCH 2/2] Update externals.sh --- src/Misc/externals.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh index 3b1f9d2820a..383221e4452 100755 --- a/src/Misc/externals.sh +++ b/src/Misc/externals.sh @@ -72,7 +72,7 @@ function acquireExternalTool() { curl -fSL --retry 3 -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl' else # Curl version is greater than 7.71.0, running curl with --retry-all-errors flag - curl -fkSL --retry 3 --retry-all-errors -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl' + curl -fSL --retry 3 --retry-all-errors -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl' fi # Move the partial file to the download target.