X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=de482c746186eb173108dd34fd7f9cb27f2f8364;hp=2c08a5b7c7d602e282819c5ca6df966d4441baec;hb=fd036680da98c60fb477f33424843b65e03b36b3;hpb=3db4aa117685545cc2eff3a584d8e8a3eadc2d6d

diff --git a/all b/all
index 2c08a5b7..de482c74 100755
--- a/all
+++ b/all
@@ -235,6 +235,12 @@ listrepos()
 			$ECHO "$d"
 			continue
 		fi
+		# remove broken clones so they don't mess up stuff
+		if [ x"$d" != x"." ] && [ -d "$d" ] && ! [ -d "$d/.git" ]; then
+			msg "$d exists but has no .git subdir. Probably a broken clone. Deleting."
+			verbose rm -rf "$d"
+			continue
+		fi
 		# if we have the dir, always keep it
 		if [ -d "$d" ]; then
 			msg "Repository $d enabled because it already exists"
@@ -587,9 +593,12 @@ case "$cmd" in
 		oldbase=$base
 		oldpushbase=$pushbase
 		# transition old URLs
-		if [ x"$base" = x"ssh://xonotic@push.git.xonotic.org/" ]; then
+		if [ x"$base" = x"ssh://xonotic@git.xonotic.org/" ]; then
 			base=ssh://xonotic@push.git.xonotic.org/
 		fi
+		if [ x"$pushbase" = x"ssh://xonotic@git.xonotic.org/" ]; then
+			pushbase=ssh://xonotic@push.git.xonotic.org/
+		fi
 		while :; do
 			if [ x"$1" = x"-N" ]; then
 				allow_pull=false
@@ -1667,8 +1676,8 @@ case "$cmd" in
 		rm -f Xonotic/key_15.d0pk
 		{
 			verbose cd Xonotic/mapping
-			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120113.tar.bz2
-			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120113-win32-7z.exe
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114.tar.bz2
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114-win32-7z.exe
 			for X in *-7z.exe; do
 				7za x "$X"
 				rm -f "$X"