diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2009-05-08 17:00:33 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2009-05-08 17:00:33 +0000 |
commit | f067828cdc168eac963540f7fffee26293f22c7d (patch) | |
tree | d0468b4ebb9dfa18ba4ca4266c76958b036830d3 | |
parent | fb54c95889ab6a5b2b7ec9b6cacfa95acbe5c226 (diff) | |
download | nixlib-f067828cdc168eac963540f7fffee26293f22c7d.tar nixlib-f067828cdc168eac963540f7fffee26293f22c7d.tar.gz nixlib-f067828cdc168eac963540f7fffee26293f22c7d.tar.bz2 nixlib-f067828cdc168eac963540f7fffee26293f22c7d.tar.lz nixlib-f067828cdc168eac963540f7fffee26293f22c7d.tar.xz nixlib-f067828cdc168eac963540f7fffee26293f22c7d.tar.zst nixlib-f067828cdc168eac963540f7fffee26293f22c7d.zip |
Allow question marks in URL...
svn path=/nixpkgs/trunk/; revision=15507
-rw-r--r-- | pkgs/build-support/fetchurl/builder.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index bbdf5fb7b4e2..22ba25e90a4f 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -73,6 +73,9 @@ tryHashedMirrors() { } +# URL list may contain ?. No glob expansion for that, please +set -o noglob + urls2= for url in $urls; do if test "${url:0:9}" != "mirror://"; then @@ -102,6 +105,8 @@ for url in $urls; do done urls="$urls2" +# Restore globbing settings +set +o noglob if test -n "$showURLs"; then echo "$urls" > $out @@ -113,12 +118,18 @@ if test -n "$preferHashedMirrors"; then tryHashedMirrors fi +# URL list may contain ?. No glob expansion for that, please +set -o noglob + success= for url in $urls; do tryDownload "$url" if test -n "$success"; then finish; fi done +# Restore globbing settings +set +o noglob + if test -z "$preferHashedMirrors"; then tryHashedMirrors fi |