pk3dir handling: detect if the matching pk3 file exists, and then ignore the repo...

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 77bb5e2bdfd731b86c847150642429485cbd7d64..bffab80cc57b73330513d68d8c2af797a9e61e02 100755 (executable)
--- a/all
+++ b/all
@@ -23,6 +23,7 @@ case "$0" in
                                # Windows hates users. So this script has to copy itself elsewhere first...
                                tname=
                                cp "$SELF" ../all.xonotic.sh
                                # Windows hates users. So this script has to copy itself elsewhere first...
                                tname=
                                cp "$SELF" ../all.xonotic.sh

+                               export WE_HATE_OUR_USERS=1

                                exec ../all.xonotic.sh "$@"
                                ;;
                esac
                                exec ../all.xonotic.sh "$@"
                                ;;
                esac


@@ -118,6 +119,16 @@ repos_urls="
        netradiant
 "
 
        netradiant
 "
 

+repos_urls=`
+       for X in $repos_urls; do 
+               d="${X%%@*}"
+               p="${d%dir}"
+               if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
+                       echo "$X"
+               fi
+       done
+`
+

 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
 
 if [ "$#" = 0 ]; then
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
 
 if [ "$#" = 0 ]; then


@@ -157,15 +168,16 @@ case "$cmd" in
                                verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
                                        # TODO remove this line later
 
                                verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
                                        # TODO remove this line later
 

-                               verbose git config core.autocrlf input
-                               verbose git config core.safecrlf true
+                               verbose git config core.autocrlf false
+                               verbose git config core.safecrlf false # we don't NEED that...

 
                                r=`git symbolic-ref HEAD`
                                r=${r#refs/heads/}
                                if git config branch.$r.remote >/dev/null 2>&1; then
                                        if ! verbose git pull; then
                                                check_mergeconflict "$d"
 
                                r=`git symbolic-ref HEAD`
                                r=${r#refs/heads/}
                                if git config branch.$r.remote >/dev/null 2>&1; then
                                        if ! verbose git pull; then
                                                check_mergeconflict "$d"

-                                               exit 1 # FATAL
+                                               echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+                                               read -r DUMMY

                                        fi
                                fi
 
                                        fi
                                fi
 


@@ -351,10 +363,16 @@ case "$cmd" in
                enter "$d0/darkplaces" verbose
                verbose make $MAKEFLAGS sv-debug
                verbose make $MAKEFLAGS cl-debug
                enter "$d0/darkplaces" verbose
                verbose make $MAKEFLAGS sv-debug
                verbose make $MAKEFLAGS cl-debug

-               verbose make $MAKEFLAGS sdl-debug
+               if ! [ -n "$WE_HATE_OUR_USERS" ]; then
+                       verbose make $MAKEFLAGS sdl-debug
+               fi

                ;;
        run)
                ;;
        run)

-               client=-sdl
+               if [ -n "$WE_HATE_OUR_USERS" ]; then
+                       client=
+               else
+                       client=-sdl
+               fi

                case "$1" in
                        sdl|glx|agl|dedicated)
                                client=-$1
                case "$1" in
                        sdl|glx|agl|dedicated)
                                client=-$1