Let FETCHER_URLS_SORT be a function

diff --git a/build/distfiles/dl-urls b/build/distfiles/dl-urls
index 0a43e13ba8961821fe20275af766a17e98bb763d20c4c76c079e2cf0da27ce20..5575f672c93259ef24cdeeb91a9f4921211975383f4bc89709461c376f328740 100755 (executable)
--- a/build/distfiles/dl-urls
+++ b/build/distfiles/dl-urls
@@ -4,4 +4,4 @@
 sname=$0 . "$BASS_ROOT"/lib/rc
 
 redo-ifchange $1/urls
-$FETCHER_URLS_SORT <$1/urls
+FETCHER_URLS_SORT <$1/urls

diff --git a/build/distfiles/dl/default.rc b/build/distfiles/dl/default.rc
index 159c1522ff651d4138fa1815b90ab2f5f3a5297f760a6e8231838215a73e1ed7..6910d68be1bd734d5281042eda1f97c5930528512e27f54a0cab98f89374b0b5 100644 (file)
--- a/build/distfiles/dl/default.rc
+++ b/build/distfiles/dl/default.rc
@@ -53,7 +53,7 @@ cd $tmp
 case "$DISTFILE_FETCHER" in
 meta4ra)
     [ -s "$metadir"/size ] && read size <"$metadir"/size || size=0
-    $FETCHER_URLS_SORT <"$metadir"/urls |
+    FETCHER_URLS_SORT <"$metadir"/urls |
     while read url ; do
         echo trying ${url}... >&2
         if [ -s "$metadir"/hashes ] ; then

diff --git a/doc/Build/Distfiles/Fetchers b/doc/Build/Distfiles/Fetchers
index 9f8b0d921b0849b0e74d3da61138e06f149bfe9e9c6ac34f18cb6651505f783f..0103b19c870e74bb08c23072a3fe2ed3510ab4021c703adefe799994918e97a9 100644 (file)
--- a/doc/Build/Distfiles/Fetchers
+++ b/doc/Build/Distfiles/Fetchers
@@ -13,8 +13,11 @@ $DISTFILES/meta/utils/metadir-to-meta4 generates .meta4 back.
 
 * $DISTFILE_FETCHER=meta4ra
   => http://www.meta4ra.stargrave.org/\r
-  Use "${FETCHER_URLS_SORT:-$DISTFILES/meta/utils/urls-sort "" rand} | meta4ra-dl"
-  command to download the randomised URL, preferring location-less URL.
+  Use meta4ra-dl for downloading. URLs are sorted with FETCHER_URLS_SORT
+  function, which is by default:
+      FETCHER_URLS_SORT() {
+          $DISTFILES/meta/utils/urls-sort "" rand
+      }
   This is by default, because meta4ra utilities are installed by default.
 
 * $DISTFILE_FETCHER=wget

diff --git a/lib/rc b/lib/rc
index 0eb868cbc3756dd083d7ced78e7f9badf707ddc99a69d6b16a02e6833b4deaf9..cf79a0b83f7a4f4f14dc979d22c2817e472c8f7a071337cbc96cd06babd77881 100644 (file)
--- a/lib/rc
+++ b/lib/rc
@@ -46,7 +46,11 @@ export SKELPKGS=${SKELPKGS:-"$BASS_ROOT"/build/pkg}
 
 # Program to use for downloading distfiles: "meta4ra", "wget", "aria2c".
 export DISTFILE_FETCHER="${DISTFILE_FETCHER:-meta4ra}"
-export FETCHER_URLS_SORT=${FETCHER_URLS_SORT:-$DISTFILES/meta/utils/urls-sort "" rand}
+if ! type FETCHER_URLS_SORT 2>/dev/null >/dev/null ; then
+    FETCHER_URLS_SORT() {
+        $DISTFILES/meta/utils/urls-sort "" rand
+    }
+fi
 
 export TASKS=${TASKS:-/nfs/tasks}
 export JOBS=${JOBS:-/nfs/jobs}