X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=bfca7a2b69e472769d186d3cc85e1dd3bd62fa1c;hp=5d801ebe81e61dcaad5cb0d5dd9a43ecd0c70faf;hb=8db939c6868ceefeac0aedfbf0d8df0c7faf8841;hpb=276157e85c08ff0d62c9ca1964d45ec90e81511a

diff --git a/all b/all
index 5d801ebe..bfca7a2b 100755
--- a/all
+++ b/all
@@ -7,6 +7,7 @@ repos="
 	data/xonotic-data.pk3dir
 	data/xonotic-maps.pk3dir
 	data/xonotic-music.pk3dir
+	data/xonotic-nexcompat.pk3dir
 	darkplaces
 "
 
@@ -20,19 +21,25 @@ d0=`pwd`
 case "$cmd" in
 	update|pull)
 		base=`git config remote.origin.url`
-		base=${base%/xonotic.git}
+		base=${base%xonotic.git}
 		for d in $repos; do
 			if [ -d "$d0/$d" ]; then
 				cd "$d0/$d"
-				git config remote.origin.url "$base/${d##*/}.git"
+				case "$d" in
+					.)
+						;;
+					*)
+						git config remote.origin.url "$base${d##*/}.git"
+						;;
+				esac
 				git pull
 				cd "$d0"
 			else
-				git clone "$base/${d##*/}.git" "$d0/$d"
+				git clone "$base${d##*/}.git" "$d0/$d"
 			fi
 		done
 		;;
-	checkout)
+	checkout|switch)
 		remote=$1
 		branch=$2
 		if [ -z "$branch" ]; then
@@ -91,7 +98,7 @@ case "$cmd" in
 		for d in $repos; do
 			cd "$d0/$d"
 			echo "In $d:"
-			git branch -a | sed 's/^/  /'
+			git branch -a | sed 's/^/  /; /->/d'
 			cd "$d0"
 		done
 		;;
@@ -113,12 +120,23 @@ case "$cmd" in
 			cd "$d0"
 		done
 		;;
+	compile)
+		(
+			cd darkplaces
+			make nexuiz
+		)
+		(
+			cd data/xonotic-data.pk3dir
+			make
+		)
+		;;
 	*)
 		echo "Usage:"
 		echo "  $0 pull"
 		echo "  $0 push"
 		echo "  $0 branches"
-		echo "  $0 branch"
+		echo "  $0 branch <remote> <branchname>"
 		echo "  $0 checkout"
+		echo "  $0 compile"
 		;;
 esac