if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for...

[xonotic/xonotic.git] / all

diff --git a/all b/all
index ebe505eab9e188f2009ef512602f842291436364..e4b60dfb95db67cf422e5f35889e4fd973d0d8f1 100755 (executable)
--- a/all
+++ b/all
@@ -394,11 +394,11 @@ bestmirror()
                m=$pre$in$suf
                if t=`mirrorspeed "$m"`; then
                        if [ -n "$t" ]; then
-                               t=$(($t$op)) # fudge factor
-                               msg "$m -> $t ticks ($op)"
-                               if [ -z "$bestt" ] || [ "$t" -lt "$bestt" ]; then
+                               tt=$(($t$op)) # fudge factor
+                               msg "$m -> $t$op = $tt ticks"
+                               if [ -z "$bestt" ] || [ "$tt" -lt "$bestt" ]; then
                                        bestin=$in
-                                       bestt=$t
+                                       bestt=$tt
                                fi
                        else
                                msg "$m -> error"
@@ -536,8 +536,23 @@ case "$cmd" in
                        fi
                        shift
                done
+               case "$location" in
+                       current)
+                               if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
+                                       git config xonotic.all.mirrorselection done
+                                       location=best
+                               fi
+                               ;;
+               esac
                case "$location" in
                        best)
+                               # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
+                               case "$base" in
+                                       ssh://*)
+                                               pushbase=$base
+                                               base=git://git.xonotic.org/xonotic/xonotic.git
+                                               ;;
+                               esac
                                newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
                                case "$newbase" in
                                        *\ *)