From: Rudolf Polzer Date: Sun, 7 Nov 2010 19:06:07 +0000 (+0100) Subject: mirror selection: bail out if "time" does not exist X-Git-Tag: xonotic-v0.1.0preview~70 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=8743a68010e33d2a725081637c5ed012fbb52fed;p=xonotic%2Fxonotic.git mirror selection: bail out if "time" does not exist --- diff --git a/all b/all index 338967a7..2ddb919f 100755 --- a/all +++ b/all @@ -352,6 +352,10 @@ bestmirror() pre=$1; shift suf=$1; shift + if ! { time -p true; } >/dev/null 2>&1; then + return 1 + fi + bestin= bestt= for in in "$@"; do @@ -368,8 +372,12 @@ bestmirror() msg "$m -> FAIL" fi done - msg "Best mirror seems to be $pre$bestin$suf" - echo "$bestin" + if [ -n "$bestin" ]; then + msg "Best mirror seems to be $pre$bestin$suf" + echo "$bestin" + else + return 1 + fi } case "$cmd" in @@ -510,7 +518,11 @@ case "$cmd" in base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"` case "$base" in *\ *) - location=`bestmirror $base"xonotic.git" de nl` + if location=`bestmirror $base"xonotic.git" de nl`; then + : + else + location= + fi ;; *) location=