X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=2b1cd557c92a1072f9d13d47f2b5b52ec002d531;hb=1bc0cc65a12e4acdc5e104d0a3e6094848fb233d;hp=f164928cc79a75df3e79f3750aec7aafc8706577;hpb=a870e86f2e720d051d480a8dd81bd502b04d0c41;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index f164928c..2b1cd557 100755
--- a/all
+++ b/all
@@ -2,9 +2,32 @@
 
 set -e
 
+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 "+ $*"
 	"$@"
 }
 
@@ -16,6 +39,7 @@ repos_urls="
 	data/xonotic-nexcompat.pk3dir
 	darkplaces
 	fteqcc@git://github.com/Blub/qclib.git
+	div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
 "
 
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
@@ -56,6 +80,9 @@ case "$cmd" in
 						;;
 				esac
 				verbose git pull
+				cd "$d0"
+				checkself "$0" "$@"
+				cd "$d0/$d"
 				verbose git remote prune origin
 				cd "$d0"
 			else
@@ -83,6 +110,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."
@@ -185,7 +213,8 @@ case "$cmd" in
 				exit 1
 			fi
 		fi
-		verbose "darkplaces/darkplaces$client" -xonotic $@
+		#verbose "darkplaces/darkplaces$client" -xonotic "$@"
+		verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
 		;;
 	each|foreach)
 		for d in $repos; do