map screenshot: do not use stdin

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 7db90a60732941eebfa0118e3cd8e9a198b91bc6..75454a32e56b79a78b0a8ca79547486805160769 100755 (executable)
--- a/all
+++ b/all
@@ -224,10 +224,9 @@ listrepos()
        for d in $repos; do
                p="${d%dir}"
                f="`repoflags "$d"`"
-               # if we have the dir, always keep it
-               if [ -d "$d" ]; then
-                       msg "Repository $d enabled because it already exists"
-                       $ECHO "$d"
+               # if we have .no file, skip
+               if [ -f "$d.no" ]; then
+                       msg "Repository $d disabled by a .no file, delete $d.no to enable"
                        continue
                fi
                # if .yes file exists, always keep it
@@ -236,9 +235,10 @@ listrepos()
                        $ECHO "$d"
                        continue
                fi
-               # if we have .no file, skip
-               if [ -f "$d.no" ]; then
-                       msg "Repository $d disabled by a .no file, delete $d.no to enable"
+               # if we have the dir, always keep it
+               if [ -d "$d" ]; then
+                       msg "Repository $d enabled because it already exists"
+                       $ECHO "$d"
                        continue
                fi
                # if we have matching pk3, skip
@@ -586,6 +586,10 @@ case "$cmd" in
                location=current
                oldbase=$base
                oldpushbase=$pushbase
+               # transition old URLs
+               if [ x"$base" = x"ssh://xonotic@push.git.xonotic.org/" ]; then
+                       base=ssh://xonotic@push.git.xonotic.org/
+               fi
                while :; do
                        if [ x"$1" = x"-N" ]; then
                                allow_pull=false