X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=d217389619a38a01c9d1d77b483ba53707a49df9;hb=7e8af582d167cd9a0cd05ff85fa53c5365b75b3b;hp=c062d95684653c1a63a93d5f63d1b403c71da1c7;hpb=fe9e135a69b6daa403f88421e9e13cfbd5ee4ff5;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index c062d956..d2173896 100755
--- a/all
+++ b/all
@@ -2,9 +2,58 @@
 
 set -e
 
+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."
+		exit 1
+	fi
+	cd ..
+done
+d0=`pwd`
+SELF="$d0/all"
+
+# If we are on WINDOWS:
+case "$0" in
+	all|*/all)
+		case "`uname`" in
+			MINGW*)
+				# Windows hates users. So this script has to copy itself elsewhere first...
+				tname=
+				cp "$SELF" ../all.xonotic.sh
+				exec ../all.xonotic.sh "$@"
+				;;
+		esac
+		;;
+esac
+
+msg()
+{
+	echo "$*"
+}
+
+self=`cksum "$SELF"`
+checkself()
+{
+	self_new=`cksum "$SELF"`
+	if [ x"$self" != x"$self_new" ]; then
+		msg "./all has changed."
+		if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
+			msg "Rerunning the requested operation to make sure."
+			export XONOTIC_FORBID_RERUN_ALL=1
+			exec "$SELF" "$@"
+		else
+			msg "Please try $SELF update, and then retry your requested operation."
+			exit 1
+		fi
+	fi
+	return 0
+}
+
 verbose()
 {
-	echo "+ $@"
+	msg "+ $*"
 	"$@"
 }
 
@@ -16,6 +65,8 @@ repos_urls="
 	data/xonotic-nexcompat.pk3dir
 	darkplaces
 	fteqcc@git://github.com/Blub/qclib.git
+	div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
+	netradiant
 "
 
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
@@ -26,7 +77,6 @@ fi
 cmd=$1
 shift
 
-d0=`pwd`
 case "$cmd" in
 	update|pull)
 		base=`git config remote.origin.url`
@@ -56,6 +106,9 @@ case "$cmd" in
 						;;
 				esac
 				verbose git pull
+				cd "$d00"
+				checkself "$SELF" "$@"
+				cd "$d0/$d"
 				verbose git remote prune origin
 				cd "$d0"
 			else
@@ -82,12 +135,14 @@ case "$cmd" in
 			else
 				verbose git checkout master
 			fi
+			cd "$d00"
+			checkself "$SELF" "$@"
 			cd "$d0"
 		done
 		if ! $exists; then
 			echo "The requested branch was not found in any repository."
 		fi
-		"$0" branch
+		exec "$SELF" branch
 		;;
 	branch)
 		remote=$1
@@ -109,7 +164,7 @@ case "$cmd" in
 				cd "$d0/$d"
 				a=
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-					echo "Branch in $d?"
+					echo "Branch in \"$d\"?"
 					read -r a
 				done
 				if [ x"$a" = x"y" ]; then
@@ -118,7 +173,7 @@ case "$cmd" in
 				fi
 				cd "$d0"
 			done
-			"$0" branch
+			"$SELF" branch
 		fi
 		;;
 	branches)
@@ -134,10 +189,21 @@ case "$cmd" in
 			cd "$d0/$d"
 			r=`git symbolic-ref HEAD`
 			r=${r#refs/heads/}
-			a=
+			if git diff HEAD | grep .; then
+				# we have uncommitted changes
+				a=
+				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+					echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+					read -r a
+				done
+				if [ x"$a" = x"y" ]; then
+					verbose git commit -a
+				fi
+			fi
 			if git log "origin/$r".."$r" | grep .; then
+				a=
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-					echo "Push $r in $d?"
+					echo "Push \"$r\" in \"$d\"?"
 					read -r a
 				done
 				if [ x"$a" = x"y" ]; then
@@ -197,13 +263,13 @@ case "$cmd" in
 		;;
 	*)
 		echo "Usage:"
-		echo "  $0 pull"
-		echo "  $0 push"
-		echo "  $0 branches"
-		echo "  $0 branch <remote> <branchname>"
-		echo "  $0 checkout"
-		echo "  $0 compile"
-		echo "  $0 run <client> <options>"
-		echo "  $0 each <command>"
+		echo "  $SELF pull"
+		echo "  $SELF push"
+		echo "  $SELF branches"
+		echo "  $SELF branch <remote> <branchname>"
+		echo "  $SELF checkout"
+		echo "  $SELF compile"
+		echo "  $SELF run <client> <options>"
+		echo "  $SELF each <command>"
 		;;
 esac