From 6453a8d105f50f5d76caade15311beadf9a36633 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Sun, 12 Jan 2025 22:40:47 +1100 Subject: [PATCH 1/2] downloader [ 4.3.4 ~ 4.4.0 ] - Fix sed issue on Windows ARM64 bash --- scripts/dev/downloader.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/dev/downloader.sh b/scripts/dev/downloader.sh index eb4498f878c..5397ad406a4 100755 --- a/scripts/dev/downloader.sh +++ b/scripts/dev/downloader.sh @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=4.3.3 +VERSION=4.4.0 printDownloaderHelp(){ cat << EOF @@ -146,9 +146,15 @@ check_remote_vs_local() { } finalurl() { - F_URL=$(echo "$@" | sed 's/[[:space:]]*$//') - # echo "finalurl: [$@] - F_URL:[$F_URL]" - curl -L -I --retry ${RETRY_MAX} --max-redirs ${MAX_REDIRECTS} --retry-connrefused --silent --location --head --output /dev/null --write-out '%{url_effective}' -- "$F_URL" + local input_url="$1" + local trimmed_url=$(echo "$input_url" | sed 's/[[:space:]]*$//') + echo "Processing URL: $trimmed_url" + local resolved_url=$(curl -L -I --retry "${RETRY_MAX:-5}" --max-redirs "${MAX_REDIRECTS:-5}" \ + --retry-connrefused --write-out '%{url_effective}' --silent --output /dev/null "$trimmed_url") + if [[ -z "$resolved_url" ]]; then + echoError "Failed to resolve URL: $trimmed_url" + return 1 + fi } downloader() { From ddd3daa9affe95219c723a9a89c5329ed78f6eba Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Sun, 12 Jan 2025 22:48:02 +1100 Subject: [PATCH 2/2] Update downloader.sh --- scripts/dev/downloader.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/dev/downloader.sh b/scripts/dev/downloader.sh index 5397ad406a4..c0e6a2c20ff 100755 --- a/scripts/dev/downloader.sh +++ b/scripts/dev/downloader.sh @@ -148,7 +148,6 @@ check_remote_vs_local() { finalurl() { local input_url="$1" local trimmed_url=$(echo "$input_url" | sed 's/[[:space:]]*$//') - echo "Processing URL: $trimmed_url" local resolved_url=$(curl -L -I --retry "${RETRY_MAX:-5}" --max-redirs "${MAX_REDIRECTS:-5}" \ --retry-connrefused --write-out '%{url_effective}' --silent --output /dev/null "$trimmed_url") if [[ -z "$resolved_url" ]]; then