set -e
repos="
+ .
data/xonotic-data.pk3dir
data/xonotic-maps.pk3dir
data/xonotic-music.pk3dir
+ data/xonotic-nexcompat.pk3dir
darkplaces
"
d0=`pwd`
case "$cmd" in
- update)
+ 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
"$0" branch
;;
branch)
- if [ $# = 0 ]; then
+ remote=$1
+ branch=$2
+ if [ -z "$branch" ]; then
+ branch=$remote
+ remote=origin
+ fi
+ if [ -z "$branch" ]; then
for d in $repos; do
cd "$d0/$d"
r=`git symbolic-ref HEAD`
echo "Branch in $d?"
read -r a
done
- if [ x"$a" = "y" ]; then
- git branch "$1"
+ if [ x"$a" = x"y" ]; then
+ git push "$remote" HEAD:"$branch"
+ git checkout --track -b "$branch" "$remote/$branch"
fi
cd "$d0"
done
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
+ ;;
+ push)
+ for d in $repos; do
+ cd "$d0/$d"
+ r=`git symbolic-ref HEAD`
+ r=${r#refs/heads/}
+ a=
+ if git log "origin/$r".."$r" | grep .; then
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Push $r in $d?"
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ git push `git config "branch.$r.remote" || echo origin` HEAD
+ fi
+ fi
cd "$d0"
done
;;
+ compile)
+ (
+ cd darkplaces
+ make nexuiz
+ )
+ (
+ cd data/xonotic-data.pk3dir
+ make
+ )
+ ;;
*)
echo "Usage:"
- echo " $0 update"
- echo " $0 branch"
+ echo " $0 pull"
+ echo " $0 push"
echo " $0 branches"
+ echo " $0 branch <remote> <branchname>"
echo " $0 checkout"
+ echo " $0 compile"
;;
esac