Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic

diff --combined all
index 338c0237fb287e18d03200a1fb1b246338328c45,864f0b098a51f39d4f3c973d1425b89ccc01f1d0..a9208f001e823ba25ef8764415644c00abdcb70e
--- 1/all
--- 2/all
+++ b/all
@@@ -2,18 -2,15 +2,18 @@@
  
  set -e
  
 -repos="
 +repos_urls="
        .
        data/xonotic-data.pk3dir
        data/xonotic-maps.pk3dir
        data/xonotic-music.pk3dir
        data/xonotic-nexcompat.pk3dir
        darkplaces
 +      fteqcc@git://github.com/Blub/qclib.git
  "
  
 +repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
 +
  if [ "$#" = 0 ]; then
        set -- help
  fi
@@@ -25,28 -22,14 +25,28 @@@ case "$cmd" i
        update|pull)
                base=`git config remote.origin.url`
                base=${base%xonotic.git}
 -              for d in $repos; do
 +              for dcomplete in $repos_urls; do
 +                      case "$dcomplete" in
 +                              *@*)
 +                                      d=${dcomplete%%@*}
 +                                      url=${dcomplete#*@}
 +                                      switch=false
 +                                      ;;
 +                              *)
 +                                      d=${dcomplete%%@*}
 +                                      url=$base${d##*/}.git
 +                                      switch=true
 +                                      ;;
 +                      esac
                        if [ -d "$d0/$d" ]; then
                                cd "$d0/$d"
                                case "$d" in
                                        .)
                                                ;;
                                        *)
 -                                              git config remote.origin.url "$base${d##*/}.git"
 +                                              if $switch; then
 +                                                      git config remote.origin.url "$base${d##*/}.git"
 +                                              fi
                                                ;;
                                esac
                                git pull
@@@ -179,6 -162,13 +179,13 @@@
                fi
                exec "darkplaces/darkplaces$client" -xonotic $@
                ;;
+       each|foreach)
+               for d in $repos; do
+                       cd "$d0/$d"
+                       "$@"
+                       cd "$d0"
+               done
+               ;;
        *)
                echo "Usage:"
                echo "  $0 pull"
@@@ -188,5 -178,6 +195,6 @@@
                echo "  $0 checkout"
                echo "  $0 compile"
                echo "  $0 run <client> <options>"
+               echo "  $0 each <command>"
                ;;
  esac