empty commits won't do. Instead, adding the synonym "switch" to checkout.

[xonotic/xonotic.git] / all

diff --git a/all b/all
index d22618ee96b3c215c9957dce3de46ff28f18078d..bfca7a2b69e472769d186d3cc85e1dd3bd62fa1c 100755 (executable)
--- 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
 "
 
@@ -38,7 +39,7 @@ case "$cmd" in
                        fi
                done
                ;;
-       checkout)
+       checkout|switch)
                remote=$1
                branch=$2
                if [ -z "$branch" ]; then
@@ -97,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
                ;;
@@ -119,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