X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=de482c746186eb173108dd34fd7f9cb27f2f8364;hb=refs%2Fheads%2Fnyov%2Fscriptfix;hp=b451ac7d26f29254f61b9fddf260ce1511fe592b;hpb=a39370ebba15e56b74b1a4a93ef0cd5abb5e84f3;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index b451ac7d..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-20110819.tar.bz2
-			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819-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"
@@ -1802,7 +1811,8 @@ case "$cmd" in
 		verbose export jpeg_qual_rgb=97
 		verbose export jpeg_qual_a=99
 		verbose export do_dds=false
-		verbose export do_ogg=false
+		verbose export do_ogg=true
+		verbose export ogg_ogg=false
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
@@ -1818,6 +1828,7 @@ case "$cmd" in
 		verbose export do_dds=true
 		verbose export dds_flags=
 		verbose export do_ogg=true
+		verbose export ogg_ogg=false
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;