X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=bffab80cc57b73330513d68d8c2af797a9e61e02;hb=474bca19f8ed45309e7c021316ac5cf53bf65f63;hp=f7a74e76c6a210974bdec6965b09d3be4205cd39;hpb=d66829412424e2a2448e007ac872f42299e93d3c;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index f7a74e76..bffab80c 100755
--- 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
+				export WE_HATE_OUR_USERS=1
 				exec ../all.xonotic.sh "$@"
 				;;
 		esac
@@ -118,6 +119,16 @@ repos_urls="
 	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
@@ -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 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"
-						exit 1 # FATAL
+						echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+						read -r DUMMY
 					fi
 				fi
 
@@ -351,10 +363,16 @@ case "$cmd" in
 		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)
-		client=-sdl
+		if [ -n "$WE_HATE_OUR_USERS" ]; then
+			client=
+		else
+			client=-sdl
+		fi
 		case "$1" in
 			sdl|glx|agl|dedicated)
 				client=-$1
@@ -465,7 +483,7 @@ case "$cmd" in
 				if ! "$SELF" compile; then
 					a=n
 				fi
-				cd "$d0/d"
+				cd "$d0/$d"
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
 					echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
 					read -r a