X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=050818ac9a2a159d7613ab263510903b2c7320d8;hp=c56b1c8fc055e183024d8be304777f89484ab707;hb=fe88fe38670eaa4e19b460e0c74482f21ef9737f;hpb=fcbf142057f37a7d77ed8c8766aa359e0d475483

diff --git a/all b/all
index c56b1c8f..050818ac 100755
--- a/all
+++ b/all
@@ -312,7 +312,7 @@ fix_git_config()
 	if [ -z "`git config push.default || true`" ]; then
 		verbose git config push.default current # or is tracking better?
 	fi
-	verbose git config filter.mapclean.clean "grep ^[^/]"
+	verbose git config filter.mapclean.clean "tr -d '\r' | grep '^[^/]'"
 	verbose git config filter.mapclean.smudge "cat"
 }
 
@@ -1166,33 +1166,33 @@ case "$cmd" in
 		#   ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
 		#   ./all clean --reclone
 		found=false
-		while :; do
-			if [ x"$1" = x"--reclone" ]; then
+		for X in "$@"; do
+			if [ x"$X" = x"--reclone" ]; then
 				force=true
 				fetchupstream=true
 				gotoupstream=true
 				gotomaster=true
 				rmuntracked=true
 				killbranches=true
-			elif [ x"$1" = x"-f" ]; then
+			elif [ x"$X" = x"-f" ]; then
 				force=true
-			elif [ x"$1" = x"-u" ]; then
+			elif [ x"$X" = x"-u" ]; then
 				gotoupstream=true
-			elif [ x"$1" = x"-U" ]; then
+			elif [ x"$X" = x"-U" ]; then
 				gotoupstream=true
 				fetchupstream=true
-			elif [ x"$1" = x"-fu" ]; then
+			elif [ x"$X" = x"-fu" ]; then
 				force=true
 				gotoupstream=true
-			elif [ x"$1" = x"-fU" ]; then
+			elif [ x"$X" = x"-fU" ]; then
 				force=true
 				gotoupstream=true
 				fetchupstream=true
-			elif [ x"$1" = x"-m" ]; then
+			elif [ x"$X" = x"-m" ]; then
 				gotomaster=true
-			elif [ x"$1" = x"-r" ]; then
+			elif [ x"$X" = x"-r" ]; then
 				rmuntracked=true
-			elif [ x"$1" = x"-D" ]; then
+			elif [ x"$X" = x"-D" ]; then
 				killbranches=true
 			else
 				break
@@ -1261,6 +1261,7 @@ case "$cmd" in
 				git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
 				git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
 			fi
+			checkself "$cmd" "$@"
 		done
 		;;
 
@@ -1395,9 +1396,9 @@ case "$cmd" in
 			# now rebrand the binaries...
 			for f in $targetfiles; do
 				#verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
-				case "$f" in
+				case "${f##*:}" in
 					xonotic*.exe)
-						verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f"
+						verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}"
 						(
 							d=`mktemp -d -t rebrand.XXXXXX`
 							cd "$d"
@@ -1406,7 +1407,7 @@ case "$cmd" in
 							cat darkplaces.zip
 							cd "$d0"
 							rm -rf "$d"
-						) >> "$f"
+						) >> "${f##*:}"
 						;;
 				esac
 			done