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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index d485f00e0da35f6030ff9d2ce90dc151a77489d8..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
 "
 
@@ -20,7 +21,7 @@ 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"
@@ -28,17 +29,17 @@ case "$cmd" in
                                        .)
                                                ;;
                                        *)
-                                               git config remote.origin.url "$base/${d##*/}.git"
+                                               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
@@ -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