rerunning did not work for me, this should fix it

[xonotic/xonotic.git] / all

diff --git a/all b/all
index d0d826cbd3b27895fd924b5da2be8c03e6c27b03..2b1cd557c92a1072f9d13d47f2b5b52ec002d531 100755 (executable)
--- a/all
+++ b/all
@@ -2,9 +2,32 @@
 
 set -e
 
+msg()
+{
+       echo "\e[1m$*\e[m"
+}
+
+self=`cksum "$0"`
+checkself()
+{
+       self_new=`cksum "$0"`
+       if [ x"$self" != x"$self_new" ]; then
+               msg "./all has changed."
+               if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
+                       msg "Rerunning the requested operation to make sure."
+                       export XONOTIC_FORBID_RERUN_ALL=1
+                       exec "$0" "$@"
+               else
+                       msg "Please try $0 update, and then retry your requested operation."
+                       exit 1
+               fi
+       fi
+       return 0
+}
+
 verbose()
 {
-       echo "\e[1m+ $@\e[m"
+       msg "+ $*"
        "$@"
 }
 
@@ -16,6 +39,7 @@ repos_urls="
        data/xonotic-nexcompat.pk3dir
        darkplaces
        fteqcc@git://github.com/Blub/qclib.git
+       div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
 "
 
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
@@ -57,6 +81,10 @@ case "$cmd" in
                                esac
                                verbose git pull
                                cd "$d0"
+                               checkself "$0" "$@"
+                               cd "$d0/$d"
+                               verbose git remote prune origin
+                               cd "$d0"
                        else
                                verbose git clone "$url" "$d0/$d"
                        fi
@@ -82,6 +110,7 @@ case "$cmd" in
                                verbose git checkout master
                        fi
                        cd "$d0"
+                       checkself "$0" "$@"
                done
                if ! $exists; then
                        echo "The requested branch was not found in any repository."
@@ -184,7 +213,8 @@ case "$cmd" in
                                exit 1
                        fi
                fi
-               verbose "darkplaces/darkplaces$client" -xonotic $@
+               #verbose "darkplaces/darkplaces$client" -xonotic "$@"
+               verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
                ;;
        each|foreach)
                for d in $repos; do