X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=f37a17f629c4cc5612daa5f3cc8bb1eabecd8e7d;hp=c6122bcca3ffc9d5c941d8a91156b48263e92a11;hb=97fe16d7d3bf7c97873cc5ef52730fee817a6f72;hpb=11d6688b16952fcad5519f1060829d65660d372b

diff --git a/all b/all
index c6122bcc..f37a17f6 100755
--- a/all
+++ b/all
@@ -2,6 +2,16 @@
 # vim: filetype=zsh
 
 set -e
+if [ -n "$ZSH_VERSION" ]; then
+	setopt SH_WORD_SPLIT
+fi
+if [ -z "$ECHO" ]; then
+	if echo "\\\\" | grep .. >/dev/null; then
+		ECHO=echo
+	else
+		ECHO=`which echo`
+	fi
+fi
 
 # I use this in EVERY shell script ;)
 LF="
@@ -11,8 +21,8 @@ ESC=""
 d00=`pwd`
 while ! [ -f ./all ]; do
 	if [ x"`pwd`" = x"/" ]; then
-		echo "Cannot find myself."
-		echo "Please run this script with the working directory inside a Xonotic checkout."
+		$ECHO "Cannot find myself."
+		$ECHO "Please run this script with the working directory inside a Xonotic checkout."
 		exit 1
 	fi
 	cd ..
@@ -36,7 +46,7 @@ esac
 
 msg()
 {
-	echo >&2 "$ESC[1m$*$ESC[m"
+	$ECHO >&2 "$ESC""[1m$*$ESC""[m"
 }
 
 self=`git hash-object "$SELF"`
@@ -67,10 +77,10 @@ visible_repo_name()
 {
 	case "$1" in
 		.)
-			echo "the root directory"
+			$ECHO "the root directory"
 			;;
 		*)
-			echo "\"$1\""
+			$ECHO "\"$1\""
 			;;
 	esac
 }
@@ -78,16 +88,16 @@ visible_repo_name()
 check_mergeconflict()
 {
 	if git ls-files -u | grep ' 1	'; then
-		echo
-		echo "MERGE CONFLICT."
-		echo "change into the \"$1\" project directory, and then:"
-		echo "- edit the files mentioned above with your favorite editor,"
-		echo "  and fix the conflicts (marked with <<<<<<< blocks)"
-		echo "- for binary files, you can select the files using"
-		echo "  git checkout --ours or git checkout --theirs"
-		echo "- when done with a file, 'git add' the file"
-		echo "- when done, 'git commit'"
-		echo
+		$ECHO
+		$ECHO "MERGE CONFLICT."
+		$ECHO "change into the \"$1\" project directory, and then:"
+		$ECHO "- edit the files mentioned above with your favorite editor,"
+		$ECHO "  and fix the conflicts (marked with <<<<<<< blocks)"
+		$ECHO "- for binary files, you can select the files using"
+		$ECHO "  git checkout --ours or git checkout --theirs"
+		$ECHO "- when done with a file, 'git add' the file"
+		$ECHO "- when done, 'git commit'"
+		$ECHO
 		exit 1
 	fi
 }
@@ -97,7 +107,7 @@ yesno()
 	yesno=
 	while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
 		eval "$2"
-		echo "$1"
+		$ECHO "$1"
 		IFS= read -r yesno
 	done
 	[ x"$yesno" = x"y" ]
@@ -124,7 +134,7 @@ fteqcc                        |
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
-repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
+repos=`$ECHO "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
 
 base=`git config remote.origin.url`
 case "$base" in
@@ -132,7 +142,7 @@ case "$base" in
 		base=${base%xonotic.git}
 		;;
 	*)
-		echo "The main repo is not xonotic.git, what have you done?"
+		$ECHO "The main repo is not xonotic.git, what have you done?"
 		exit 1
 		;;
 esac
@@ -144,28 +154,28 @@ case "$pushbase" in
 	'')
 		;;
 	*)
-		echo "The main repo is not xonotic.git, what have you done?"
+		$ECHO "The main repo is not xonotic.git, what have you done?"
 		exit 1
 		;;
 esac
 
 repourl()
 {
-	repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
+	repo_t=`$ECHO "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
 	if [ -n "$repo_t" ]; then
 		case "$repo_t" in
 			*://*)
-				echo "$repo_t"
+				$ECHO "$repo_t"
 				;;
 			*)
-				echo "$base$repo_t"
+				$ECHO "$base$repo_t"
 				;;
 		esac
 	else
 		if [ x"$1" = x"." ]; then
-			echo "$base""xonotic.git"
+			$ECHO "$base""xonotic.git"
 		else
-			echo "$base${1##*/}.git"
+			$ECHO "$base${1##*/}.git"
 		fi
 	fi
 }
@@ -173,37 +183,37 @@ repourl()
 repopushurl()
 {
 	[ -n "$pushbase" ] || return 0
-	repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
+	repo_t=`$ECHO "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
 	if [ -n "$repo_t" ]; then
 		case "$repo_t" in
 			*://*)
 				;;
 			*)
-				echo "$pushbase$repo_t"
+				$ECHO "$pushbase$repo_t"
 				;;
 		esac
 	else
 		if [ x"$1" = x"." ]; then
-			echo "$pushbase""xonotic.git"
+			$ECHO "$pushbase""xonotic.git"
 		else
-			echo "$pushbase${1##*/}.git"
+			$ECHO "$pushbase${1##*/}.git"
 		fi
 	fi
 }
 
 repobranch()
 {
-	repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
+	repo_t=`$ECHO "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
 	if [ -n "$repo_t" ]; then
-		echo "$repo_t"
+		$ECHO "$repo_t"
 	else
-		echo "master"
+		$ECHO "master"
 	fi
 }
 
 repoflags()
 {
-	echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
+	$ECHO "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
 }
 
 listrepos()
@@ -214,13 +224,13 @@ listrepos()
 		# if we have the dir, always keep it
 		if [ -d "$d" ]; then
 			msg "Repository $d enabled because it already exists"
-			echo "$d"
+			$ECHO "$d"
 			continue
 		fi
 		# if .yes file exists, always keep it
 		if [ -f "$d.yes" ]; then
 			msg "Repository $d enabled by a .yes file"
-			echo "$d"
+			$ECHO "$d"
 			continue
 		fi
 		# if we have .no file, skip
@@ -242,7 +252,7 @@ listrepos()
 		esac
 		# default: enable
 		msg "Repository $d enabled by default"
-		echo "$d"
+		$ECHO "$d"
 	done
 }
 
@@ -259,6 +269,19 @@ fix_upstream_rebase()
 	if [ -z "$r_me" ] || [ -z "$r_other" ]; then
 		return
 	fi
+
+	# one of the two sides of the merge should be remote upstream, or all is fine
+	r_r=`git symbolic-ref HEAD`
+	r_r=${r_r#refs/heads/}
+	r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
+	r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+	r_bra=${r_bra#refs/heads/}
+	if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
+		if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
+			return
+		fi
+	fi
+
 	r_base=`git merge-base "$r_me" "$r_other"`
 
 	# no merge-base? upstream did filter-branch
@@ -268,9 +291,9 @@ fix_upstream_rebase()
 		r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merge" | sort -u`
 
 		# heuristics: upstream rebase/filter-branch if more than 50% of the commits of one of the sides are in the other too
-		r_lc_me=`echo "$r_l_me" | wc -l`
-		r_lc_other=`echo "$r_l_other" | wc -l`
-		r_lc_together=`{ echo "$r_l_me"; echo "$r_l_other"; } | sort -u | wc -l`
+		r_lc_me=`$ECHO "$r_l_me" | wc -l`
+		r_lc_other=`$ECHO "$r_l_other" | wc -l`
+		r_lc_together=`{ $ECHO "$r_l_me"; $ECHO "$r_l_other"; } | sort -u | wc -l`
 		r_lc_same=$(($r_lc_me + $r_lc_other - $r_lc_together))
 
 		if [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_me )) ] || [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_other )) ]; then
@@ -339,6 +362,60 @@ mkzip0()
 	zip -0y "$@"
 }
 
+mirrorspeed()
+{
+	# first result is to be ignored, but we use it to check status
+	git ls-remote "$1" refs/heads/master >/dev/null 2>&1 || return 1
+	{ time -p git ls-remote "$1" refs/heads/master; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,'
+		# unit: clock ticks (depends on what "time" returns
+}
+
+bestmirror()
+{
+	pre=$1; shift
+	suf=$1; shift
+
+	if ! { time -p true; } >/dev/null 2>&1; then
+		return 1
+	fi
+
+	bestin=
+	bestt=
+	for mir in "$@"; do
+		case "$mir" in
+			*:*)
+				in=${mir%%:*}
+				op=${mir#*:}
+				;;
+			*)
+				in=$mir
+				op=
+				;;
+		esac
+		m=$pre$in$suf
+		if t=`mirrorspeed "$m"`; then
+			if [ -n "$t" ]; then
+				tt=$(($t$op)) # fudge factor
+				msg "$m -> $t$op = $tt ticks"
+				if [ -z "$bestt" ] || [ "$tt" -lt "$bestt" ]; then
+					bestin=$in
+					bestt=$tt
+				fi
+			else
+				msg "$m -> error"
+			fi
+		else
+			msg "$m -> FAIL"
+		fi
+	done
+	if [ -n "$bestin" ]; then
+		msg "Best mirror seems to be $pre$bestin$suf"
+		$ECHO "$bestin"
+	else
+		return 1
+	fi
+}
+
 case "$cmd" in
 	fix_upstream_rebase)
 		for d in $repos; do
@@ -438,12 +515,16 @@ case "$cmd" in
 				case "$2" in
 					nl) ;;
 					de) ;;
+					us) ;;
+					best) ;;
 					default) ;;
 					*)
 						msg "Invalid location!"
 						msg "Possible locations for the -l option:"
 						msg "  nl (Netherlands, run by merlijn)"
 						msg "  de (Germany, run by divVerent)"
+						msg "  us (United States of America, run by detrate)"
+						msg "  best (find automatically)"
 						msg "  default (currently nl)"
 						exit 1
 						;;
@@ -456,6 +537,38 @@ 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/
+						;;
+				esac
+				newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
+				case "$newbase" in
+					*\ *)
+						if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much
+							:
+						else
+							location=current
+						fi
+						;;
+					*)
+						location=current
+						;;
+				esac
+				;;
+		esac
 		case "$location" in
 			default)
 				location=
@@ -473,11 +586,11 @@ case "$cmd" in
 				;;
 		esac
 		if [ -n "$location" ]; then
-			base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
-			pushbase=`echo "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
+			base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
+			pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
 		else
-			base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
-			pushbase=`echo "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
+			base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
+			pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
 		fi
 		if $fix_config; then
 			url=`repourl .`
@@ -500,7 +613,7 @@ case "$cmd" in
 						if ! verbose git pull; then
 							fix_upstream_rebase_mergefail || true
 							check_mergeconflict "$d"
-							echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+							$ECHO "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
 							read -r DUMMY
 						else
 							fix_upstream_rebase_mergeok || true
@@ -566,7 +679,7 @@ case "$cmd" in
 					exists=true
 					verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
 				else
-					echo "WTF? Not even branch $b doesn't exist in $d"
+					$ECHO "WTF? Not even branch $b doesn't exist in $d"
 					exit 1
 				fi
 			fi
@@ -575,7 +688,7 @@ case "$cmd" in
 			cd "$d0"
 		done
 		if ! $exists; then
-			echo "The requested branch was not found in any repository."
+			$ECHO "The requested branch was not found in any repository."
 		fi
 		exec "$SELF" branch
 		;;
@@ -592,7 +705,7 @@ case "$cmd" in
 				enter "$d0/$d"
 				r=`git symbolic-ref HEAD`
 				r=${r#refs/heads/}
-				echo "$d is at $r"
+				$ECHO "$d is at $r"
 				cd "$d0"
 			done
 		else
@@ -600,7 +713,7 @@ case "$cmd" in
 				dv=`visible_repo_name "$d"`
 				enter "$d0/$d" verbose
 				if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
-					echo "Already having this branch in $dv."
+					$ECHO "Already having this branch in $dv."
 				else
 					if yesno "Branch in $dv?"; then
 						if [ -n "$srcbranch" ]; then
@@ -636,17 +749,17 @@ case "$cmd" in
 					continue
 				fi
 				BRANCH=${BRANCH#remotes/}
-				ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
+				ID=`$ECHO "$BRANCH" | tr -c "A-Za-z0-9." "_"`
 				branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
 				eval "r=\$branches_repos_$ID"
 				r="$r $d"
 				eval "branches_repos_$ID=\$r"
 			done
-			echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
-				ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
+			$ECHO -n "$branches_list" | xargs -n 1 $ECHO | sort -u | while IFS= read -r BRANCH; do
+				ID=`$ECHO "$BRANCH" | tr -c "A-Za-z0-9." "_"`
 				eval "r=\$branches_repos_$ID"
 				printf "%-60s %s\n" "$BRANCH" "$r"
-				#echo "$BRANCH: $r"
+				#$ECHO "$BRANCH: $r"
 			done
 		}
 		;;
@@ -678,19 +791,19 @@ case "$cmd" in
 			diffdata=`git diff --color HEAD`
 			if [ -n "$diffdata" ]; then
 				# we have uncommitted changes
-				if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then
+				if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" '$ECHO "$diffdata" | less -r'; then
 					verbose git commit -a
 				fi
 			fi
-			rem=`git config "branch.$r.remote" || echo origin`
-			bra=`git config "branch.$r.merge" || echo "$r"`
+			rem=`git config "branch.$r.remote" || $ECHO origin`
+			bra=`git config "branch.$r.merge" || $ECHO "$r"`
 			upstream="$rem/${bra#refs/heads/}"
 			if ! git rev-parse "$upstream" >/dev/null 2>&1; then
 				upstream="origin/`repobranch "$d"`"
 			fi
 			logdata=`git log --color "$upstream".."$r"`
 			if [ -n "$logdata" ]; then
-				if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then
+				if yesno "Push \"$r\" in $dv?" '$ECHO "$logdata" | less -r'; then
 					verbose git push "$rem" HEAD
 				fi
 			fi
@@ -730,7 +843,17 @@ case "$cmd" in
 					;;
 				-r)
 					debug=release
-					export CC="$CC -g -mtune=native -march=native"
+					export CC="$CC -g"
+					case "`$CC -dumpversion`" in
+						[5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*)
+							# gcc 4.3 or higher
+							# -march=native is broken < 4.3
+							export CC="$CC -mtune=native -march=native"
+							;;
+					esac
+					if [ -n "$WE_HATE_OUR_USERS" ]; then
+						export CC="$CC -fno-common"
+					fi
 					shift
 					;;
 				*)
@@ -751,7 +874,7 @@ case "$cmd" in
 					TARGETS="sv-$debug sdl-$debug"
 					;;
 			esac
-			export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
+			export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
 		else
 			TARGETS="sv-$debug cl-$debug sdl-$debug"
 		fi
@@ -812,20 +935,23 @@ case "$cmd" in
 			mkdir -p .libs
 			if [ -n "$WE_HATE_OUR_USERS" ]; then
 				verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
+				verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/
 				verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
 			else
 				case "`uname`" in
 					Linux)
 						case `uname -m` in
 							x86_64)
-								verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/
-								verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/
-								MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/"
+								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/
+								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_rijndael".* .libs/
+								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/
+								MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/"
 								;;
 							*86)
-								verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/
-								verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/
-								MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/"
+								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/
+								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_rijndael".* .libs/
+								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/
+								MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/"
 								;;
 							*)
 								compiled0=true
@@ -834,6 +960,7 @@ case "$cmd" in
 						;;
 					Darwin)
 						verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id".* .libs/
+						verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael".* .libs/
 						;;
 					*)
 						compiled0=true
@@ -869,7 +996,7 @@ case "$cmd" in
 
 		enter "$d0/darkplaces" verbose
 		if [ x"$BAD_TARGETS" = x" " ]; then
-			echo "Warning: invalid empty client, default clients will be used."
+			$ECHO "Warning: invalid empty client, default clients will be used."
 		fi
 		if $cleandp; then
 			verbose make $MAKEFLAGS clean
@@ -878,7 +1005,7 @@ case "$cmd" in
 			verbose make $MAKEFLAGS STRIP=: "$@" "$T"
 		done
 		for T in $BAD_TARGETS; do
-			echo "Warning: discarded invalid client $T."
+			$ECHO "Warning: discarded invalid client $T."
 		done
 
 		verbose "$SELF" update-maps
@@ -909,7 +1036,7 @@ case "$cmd" in
 			if [ -x "darkplaces/darkplaces$client.exe" ]; then
 				client=$client.exe
 			else
-				echo "Client darkplaces/darkplaces$client not found, aborting"
+				$ECHO "Client darkplaces/darkplaces$client not found, aborting"
 				exit 1
 			fi
 		fi
@@ -926,9 +1053,9 @@ case "$cmd" in
 
 		binary=$1
 
-		if [ -n "$USE_GDB" ]; then
+		if [ x"$USE_GDB" = x"yes" ]; then
 			set -- gdb --args "$@"
-		elif which gdb >/dev/null 2>&1; then
+		elif [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
 			set -- gdb --batch -x savecore.gdb --args "$@"
 		elif which catchsegv >/dev/null 2>&1; then
 			set -- catchsegv "$@"
@@ -943,9 +1070,10 @@ case "$cmd" in
 			#	# somehow send it
 			#	rm -f xonotic.core.tar.gz
 			else
-				echo "The core dump can be examined later by"
-				echo "  gdb $binary xonotic.core"
+				$ECHO "The core dump can be examined later by"
+				$ECHO "  gdb $binary xonotic.core"
 			fi
+			exit 1
 		fi
 		;;
 	each|foreach)
@@ -989,10 +1117,10 @@ case "$cmd" in
 						continue
 					fi
 					if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
-						echo "$d" > "$patchdir/$i/info.txt"
-						echo "$BRANCH" >> "$patchdir/$i/info.txt"
-						echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
-						echo "$TRACK" >> "$patchdir/$i/info.txt"
+						$ECHO "$d" > "$patchdir/$i/info.txt"
+						$ECHO "$BRANCH" >> "$patchdir/$i/info.txt"
+						$ECHO "$UPSTREAM" >> "$patchdir/$i/info.txt"
+						$ECHO "$TRACK" >> "$patchdir/$i/info.txt"
 						i=$(($i+1))
 					else
 						rm -rf "$patchdir/$i"
@@ -1033,12 +1161,12 @@ case "$cmd" in
 		reportecho()
 		{
 			report=$report"$*$LF"
-			echo "$*"
+			$ECHO "$*"
 		}
 		reportecho4()
 		{
 			report=$report"    $*$LF"
-			echo "    $*"
+			$ECHO "    $*"
 		}
 		reportdo4()
 		{
@@ -1101,14 +1229,14 @@ case "$cmd" in
 					diffdata=`git diff --color --find-copies-harder --ignore-space-change "$realbase"..."$ref"`
 					if [ -z "$diffdata" ]; then
 						reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
-						if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
+						if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ $ECHO "$logdata"; } | less -r'; then
 							git push origin :"${ref#refs/remotes/origin/}"
 							reportecho4 "--> branch deleted"
 						fi
 					elif [ -z "$branch" ] && [ -n "$note" ]; then
-						reportdo4 echo "$note"
+						reportdo4 $ECHO "$note"
 						reportecho4 "--> not merging, already had this one rejected before"
-					elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
+					elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ $ECHO "$logdata"; $ECHO "$diffdata"; } | less -r'; then
 						git checkout "$realbase"
 						org=`git rev-parse HEAD`
 						if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1	' >/dev/null; }; then
@@ -1129,7 +1257,7 @@ case "$cmd" in
 								git push origin :"${ref#refs/remotes/origin/}"
 								reportecho4 "--> test failed, branch deleted"
 							elif [ -n "$note" ]; then
-								reportdo4 echo "$note"
+								reportdo4 $ECHO "$note"
 								reportecho4 "--> test failed"
 							else
 								reportecho4 "--> test failed, postponed"
@@ -1140,7 +1268,7 @@ case "$cmd" in
 							find . -type f -exec touch {} \;
 							git commit -a --amend -C HEAD || true # don't fail if nothing to commit
 
-							echo "MERGING"
+							$ECHO "MERGING"
 							case ",`repoflags "$d"`," in
 								*,svn,*)
 									# we do quite a mess here... luckily we know $org
@@ -1166,7 +1294,7 @@ case "$cmd" in
 							git push origin :"${ref#refs/remotes/origin/}"
 							reportecho4 "--> branch deleted"
 						elif [ -n "$note" ]; then
-							reportdo4 echo "$note"
+							reportdo4 $ECHO "$note"
 							reportecho4 "--> rejected"
 						else
 							reportecho4 "--> postponed"
@@ -1178,7 +1306,7 @@ case "$cmd" in
 			reportecho ""
 		done
 		rm -f "$t"
-		echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
+		$ECHO "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
 		;;
 	clean)
 		"$SELF" fix_config
@@ -1221,20 +1349,21 @@ case "$cmd" in
 				rmuntracked=true
 			elif [ x"$X" = x"-D" ]; then
 				killbranches=true
-			elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
-				msg '        _____'
-				msg '    ,--'\''-\\P/`\\  FFFFFFF'
-				msg ' __/_    B/,-.\\  FFFFFFF'
-				msg ' /  _\\  (//  O\\\\  FFFFFF'
-				msg '| (O  `) _\\._ _)\\  FFFUU'
-				msg '| |___/.^d0~~"\\  \\ UUUU'
-				msg '|     |`~'\''     \\ |  UUUU'
-				msg '|     |    __,C>|| UUUU'
-				msg '\\    /_ ,-/,-'\''   |  UUUU'
-				msg ' \\\\_ \\_>~'\''      /  UUUU-'
-
+			elif $ECHO "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+				msg ''
+				msg "        _____"
+				msg "    ,--'-\\P/\`\\  FFFFFFF"
+				msg " __/_    B/,-.\\  FFFFFFF"
+				msg " /  _\\  (//  O\\\\  FFFFFF"
+				msg "| (O  \`) _\\._ _)\\  FFFUU"
+				msg "| |___/.^d0~~\"\\  \\ UUUU"
+				msg "|     |\`~'     \\ |  UUUU"
+				msg "|     |    __,C>|| UUUU"
+				msg "\\    /_ ,-/,-'   |  UUUU"
+				msg " \\\\_ \\_>~'      /  UUUU-"
+				msg ''
 			else
-				break
+				msg "Unknown arg: $X"
 			fi
 			found=true
 			shift
@@ -1259,8 +1388,8 @@ case "$cmd" in
 				else
 					r=`git symbolic-ref HEAD`
 					r=${r#refs/heads/}
-					rem=`git config "branch.$r.remote" || echo origin`
-					bra=`git config "branch.$r.merge" || echo "$r"`
+					rem=`git config "branch.$r.remote" || $ECHO origin`
+					bra=`git config "branch.$r.merge" || $ECHO "$r"`
 					upstream="$rem/${bra#refs/heads/}"
 					if $fetchupstream; then
 						verbose git fetch "$rem"
@@ -1284,10 +1413,10 @@ case "$cmd" in
 			if $rmuntracked; then
 				case "$d" in
 					.)
-						verbose git clean -df
+						verbose git clean -df || true
 						;;
 					*)
-						verbose git clean -xdf
+						verbose git clean -xdf || true
 						;;
 				esac
 			fi
@@ -1297,8 +1426,8 @@ case "$cmd" in
 						verbose git branch -D "${B#refs/heads/}"
 					fi
 				done
-				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
+				git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch --track master origin/master || true
+				git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch --track "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
 			fi
 			checkself "$cmd" "$@"
 		done
@@ -1308,14 +1437,8 @@ case "$cmd" in
 	release-prepare)
 		#"$SELF" each git clean -fxd
 		case "$RELEASETYPE" in
-			beta)
-				msg "Building a BETA"
-				;;
-			release)
-				msg "Building a RELEASE"
-				;;
-			*)
-				echo >&2 -n "$ESC[2J$ESC[H"
+			'')
+				$ECHO >&2 -n "$ESC[2J$ESC[H"
 				msg ""
 				msg ""
 				msg ""
@@ -1356,11 +1479,17 @@ case "$cmd" in
 				#   (YYYYMMDD)
 				exit 1
 				;;
+			release)
+				msg "Building a FINISHED RELEASE"
+				;;
+			*)
+				msg "Building a $RELEASETYPE"
+				;;
 		esac
 		verbose rm -rf Xonotic Xonotic*.zip
 		verbose mkdir -p Xonotic
 		if [ -n "$RELEASEDATE" ]; then
-			verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
+			verbose $ECHO "$RELEASEDATE" > Xonotic/stamp.txt
 		else
 			verbose date +%Y%m%d > Xonotic/stamp.txt
 		fi
@@ -1441,7 +1570,7 @@ case "$cmd" in
 						(
 							d=`mktemp -d -t rebrand.XXXXXX`
 							cd "$d"
-							echo "-mygames" > darkplaces.opt
+							$ECHO "-mygames" > darkplaces.opt
 							zip -9r darkplaces.zip darkplaces.opt
 							cat darkplaces.zip
 							cd "$d0"
@@ -1523,15 +1652,7 @@ case "$cmd" in
 		verbose "$SELF" update-maps
 		;;
 	release-qc)
-		case "$RELEASETYPE" in
-			beta)
-				verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
-				# back out of: source/qcsrc/server
-				;;
-			release)
-				verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
-				;;
-		esac
+		verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
 		verbose rm -f Xonotic/source/*/fteqcc.log
 		;;
 	release-buildpk3-transform-raw)
@@ -1557,7 +1678,7 @@ case "$cmd" in
 		# music: reduce bitrate
 		verbose export do_jpeg=true
 		verbose export jpeg_qual_rgb=80
-		verbose export jpeg_qual_a=99
+		verbose export jpeg_qual_a=97
 		verbose export do_dds=false
 		verbose export do_ogg=true
 		verbose export ogg_qual=1
@@ -1612,8 +1733,10 @@ case "$cmd" in
 			patch=$(($gv - $major * 10000 - $minor * 100))
 			versionstr="$major.$minor.$patch"
 			case "$RELEASETYPE" in
-				beta)
-					versionstr="$versionstr""beta"
+				release)
+					;;
+				*)
+					versionstr="$versionstr$RELEASETYPE"
 					;;
 			esac
 			verbose sed -i "
@@ -1621,6 +1744,13 @@ case "$cmd" in
 				s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 				s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
 			" defaultXonotic.cfg
+			case "$RELEASETYPE" in
+				release)
+					echo "" >> defaultXonotic.cfg
+					echo "// nicer menu" >> defaultXonotic.cfg
+					echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+					;;
+			esac
 			(
 				verbose cd gfx/menu/luminos
 				verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
@@ -1718,12 +1848,6 @@ case "$cmd" in
 			Xonotic/data/xonotic-$stamp-data-low.pk3 \
 			Xonotic/data/xonotic-$stamp-maps-low.pk3 \
 			Xonotic/data/xonotic-$stamp-music-low.pk3
-#		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
-#		verbose mkzip0 Xonotic-$stamp-high.zip \
-#			Xonotic/data/xonotic-$stamp-data-raw.pk3 \
-#			Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
-#			Xonotic/data/xonotic-$stamp-music.pk3 \
-#			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
 		verbose mkzip0 Xonotic-$stamp-lowdds.zip \
 			Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \
@@ -1740,26 +1864,26 @@ case "$cmd" in
 		;;
 
 	*)
-		echo "Usage:"
-		echo "  $SELF admin-merge [<branch>]"
-		echo "  $SELF branch <branch>"
-		echo "  $SELF branch <remote> <branch> [<srcbranch>]"
-		echo "  $SELF branches"
-		echo "  $SELF checkout|switch <branch>"
-		echo "  $SELF checkout|switch <remote>/<branch>"
-		echo "  $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
-		echo "  $SELF clean --reclone"
-		echo "  $SELF compile [-c] [-r] [-0]"
-		echo "  $SELF each|foreach [-k] command..."
-		echo "  $SELF fix_upstream_rebase"
-		echo "  $SELF keygen"
-		echo "  $SELF merge"
-		echo "  $SELF push|commit [-s]"
-		echo "  $SELF release"
-		echo "  $SELF restore-patches"
-		echo "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
-		echo "  $SELF save-patches"
-		echo "  $SELF update-maps"
-		echo "  $SELF update|pull [-N] [-s | -h [-p] | -g [-p]] [-l de|nl|default]"
+		$ECHO "Usage:"
+		$ECHO "  $SELF admin-merge [<branch>]"
+		$ECHO "  $SELF branch <branch>"
+		$ECHO "  $SELF branch <remote> <branch> [<srcbranch>]"
+		$ECHO "  $SELF branches"
+		$ECHO "  $SELF checkout|switch <branch>"
+		$ECHO "  $SELF checkout|switch <remote>/<branch>"
+		$ECHO "  $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
+		$ECHO "  $SELF clean --reclone"
+		$ECHO "  $SELF compile [-c] [-r] [-0]"
+		$ECHO "  $SELF each|foreach [-k] command..."
+		$ECHO "  $SELF fix_upstream_rebase"
+		$ECHO "  $SELF keygen"
+		$ECHO "  $SELF merge"
+		$ECHO "  $SELF push|commit [-s]"
+		$ECHO "  $SELF release"
+		$ECHO "  $SELF restore-patches"
+		$ECHO "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+		$ECHO "  $SELF save-patches"
+		$ECHO "  $SELF update-maps"
+		$ECHO "  $SELF update|pull [-N] [-s | -h [-p] | -g [-p]] [-l de|nl|default]"
 		;;
 esac