X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=all;h=e72fda09bae6e74561a3c5f3b0c9fb4084e25b4e;hb=3dca7f8211c657503129fb30627a03e5bfc3fd9b;hp=d0d826cbd3b27895fd924b5da2be8c03e6c27b03;hpb=d931065aa39fbdc6afcd26d797a0b5be8f37a707;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index d0d826cb..e72fda09 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,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,6 +51,13 @@ fi
 cmd=$1
 shift
 
+d00=`pwd`
+case "$0" in
+	*/*)
+		cd "${0%/*}"
+		;;
+esac
+
 d0=`pwd`
 case "$cmd" in
 	update|pull)
@@ -56,6 +88,10 @@ case "$cmd" in
 						;;
 				esac
 				verbose git pull
+				cd "$d00"
+				checkself "$0" "$@"
+				cd "$d0/$d"
+				verbose git remote prune origin
 				cd "$d0"
 			else
 				verbose git clone "$url" "$d0/$d"
@@ -81,6 +117,8 @@ case "$cmd" in
 			else
 				verbose git checkout master
 			fi
+			cd "$d00"
+			checkself "$0" "$@"
 			cd "$d0"
 		done
 		if ! $exists; then
@@ -108,7 +146,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
@@ -133,10 +171,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
@@ -184,7 +233,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