cleanup more (don't change mirror if no mirror selection possible)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 2ddb919f886e5543d8d9d2bbbd8f7b329133e5dd..64cd09977905099018505f0f63de0af3c09af378 100755 (executable)
--- a/all
+++ b/all
@@ -499,6 +499,23 @@ case "$cmd" in
                        fi
                        shift
                done
+               case "$location" in
+                       best)
+                               newbase=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
+                               case "$newbase" in
+                                       *\ *)
+                                               if location=`bestmirror $newbase"xonotic.git" de nl`; then
+                                                       :
+                                               else
+                                                       location=current
+                                               fi
+                                               ;;
+                                       *)
+                                               location=current
+                                               ;;
+                               esac
+                               ;;
+               esac
                case "$location" in
                        default)
                                location=
@@ -514,21 +531,6 @@ case "$cmd" in
                                                ;;
                                esac
                                ;;
-                       best)
-                               base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
-                               case "$base" in
-                                       *\ *)
-                                               if location=`bestmirror $base"xonotic.git" de nl`; then
-                                                       :
-                                               else
-                                                       location=
-                                               fi
-                                               ;;
-                                       *)
-                                               location=
-                                               ;;
-                               esac
-                               ;;
                esac
                if [ -n "$location" ]; then
                        base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`