X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=6011b54e52ee9f13782f10816c98b2c36088ff08;hp=a409faa0b7b9eff7f07c39a6ff582edd10ff98d3;hb=db1393bf338eafd04c38ed4f94769da4821e8ecf;hpb=a3518ca2fb238b13d1bddc4c45855a78c7db7127

diff --git a/all b/all
index a409faa0..6011b54e 100755
--- a/all
+++ b/all
@@ -2,11 +2,32 @@
 
 set -e
 
-self=`cat "$0"`
+msg()
+{
+	echo "$*"
+}
+
+self=`cksum "$0"`
+checkself()
+{
+	self_new=`cksum "$0"`
+	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 "$0" "$@"
+		else
+			msg "Please try $0 update, and then retry your requested operation."
+			exit 1
+		fi
+	fi
+	return 0
+}
 
 verbose()
 {
-	echo "+ $@"
+	msg "+ $*"
 	"$@"
 }
 
@@ -18,6 +39,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`
@@ -28,6 +51,12 @@ fi
 cmd=$1
 shift
 
+case "$0" in
+	*/*)
+		cd "${0%/*}"
+		;;
+esac
+
 d0=`pwd`
 case "$cmd" in
 	update|pull)
@@ -58,6 +87,9 @@ case "$cmd" in
 						;;
 				esac
 				verbose git pull
+				cd "$d0"
+				checkself "$0" "$@"
+				cd "$d0/$d"
 				verbose git remote prune origin
 				cd "$d0"
 			else
@@ -85,6 +117,7 @@ case "$cmd" in
 				verbose git checkout master
 			fi
 			cd "$d0"
+			checkself "$0" "$@"
 		done
 		if ! $exists; then
 			echo "The requested branch was not found in any repository."
@@ -111,7 +144,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
@@ -122,7 +155,6 @@ case "$cmd" in
 			done
 			"$0" branch
 		fi
-		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	branches)
 		for d in $repos; do
@@ -131,17 +163,27 @@ case "$cmd" in
 			git branch -a | sed 's/^/  /; /->/d'
 			cd "$d0"
 		done
-		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	push)
 		for d in $repos; do
 			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
@@ -150,7 +192,6 @@ case "$cmd" in
 			fi
 			cd "$d0"
 		done
-		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	compile)
 		if [ -z "$MAKEFLAGS" ]; then
@@ -169,7 +210,6 @@ case "$cmd" in
 		verbose make $MAKEFLAGS sv-debug
 		verbose make $MAKEFLAGS cl-debug
 		verbose make $MAKEFLAGS sdl-debug
-		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	run)
 		client=-sdl
@@ -193,7 +233,6 @@ case "$cmd" in
 		fi
 		#verbose "darkplaces/darkplaces$client" -xonotic "$@"
 		verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
-		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	each|foreach)
 		for d in $repos; do
@@ -201,7 +240,6 @@ case "$cmd" in
 			verbose "$@"
 			cd "$d0"
 		done
-		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	*)
 		echo "Usage:"
@@ -213,20 +251,5 @@ case "$cmd" in
 		echo "  $0 compile"
 		echo "  $0 run <client> <options>"
 		echo "  $0 each <command>"
-		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 esac
-
-self_new=`cat "$0"`
-if [ x"$self" != x"$self_new" ]; then
-	echo "./all has changed."
-	if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
-		echo "Rerunning the requested operation to make sure."
-		export XONOTIC_FORBID_RERUN_ALL=1
-		"$0" update
-		"$0" "$@"
-	else
-		echo "Please try $0 update, and then retry your requested operation."
-		exit 1
-	fi
-fi