diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 9add2b27a072..228fcd2ed185 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -124,10 +124,10 @@ tryHashedMirrors() { # URL list may contain ?. No glob expansion for that, please set -o noglob -urls2= +resolvedUrls=() for url in "${urls[@]}"; do if test "${url:0:9}" != "mirror://"; then - urls2="$urls2 $url" + resolvedUrls+=("$url") else url2="${url:9}"; echo "${url2/\// }" > split; read site fileName < split #varName="mirror_$site" @@ -142,18 +142,17 @@ for url in "${urls[@]}"; do if test -n "${!varName}"; then mirrors="${!varName}"; fi for url3 in $mirrors; do - urls2="$urls2 $url3$fileName"; + resolvedUrls+=("$url3$fileName"); done fi fi done -urls="$urls2" # Restore globbing settings set +o noglob if test -n "$showURLs"; then - echo "$urls" > $out + echo "${resolvedUrls[*]}" > $out exit 0 fi @@ -165,7 +164,7 @@ fi set -o noglob success= -for url in $urls; do +for url in "${resolvedUrls[@]}"; do if [ -z "$postFetch" ]; then case "$url" in https://github.com/*/archive/*)