# 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
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
dv=`visible_repo_name "$d"`
enter "$d0/$d" verbose
a=
- while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Branch in $dv?"
- read -r a
- done
- if [ x"$a" = x"y" ]; then
- verbose git push "$remote" "$srcbranch":"$branch"
- verbose git checkout --track -b "$branch" "$remote/$branch"
+ if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
+ echo "Already having this branch in $dv."
+ else
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Branch in $dv?"
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ verbose git push "$remote" "$srcbranch":"$branch"
+ verbose git checkout --track -b "$branch" "$remote/$branch"
+ fi
fi
cd "$d0"
done
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
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