now also ignore SIGSTOP

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 051a5e8e5ace91e81422c302d0c33fdcf54910a5..35e23577732915c58d167ceba7a42ecbb9d0d13e 100755 (executable)
--- a/all
+++ b/all
@@ -275,6 +275,7 @@ fix_upstream_rebase()
        r_r=${r_r#refs/heads/}
        r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
        r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+       r_bra=${r_bra#refs/heads/}
        if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                        return
@@ -546,6 +547,13 @@ case "$cmd" in
                esac
                case "$location" in
                        best)
+                               # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
+                               case "$base" in
+                                       ssh://*)
+                                               pushbase=$base
+                                               base=git://git.xonotic.org/xonotic/
+                                               ;;
+                               esac
                                newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
                                case "$newbase" in
                                        *\ *)
@@ -1650,7 +1658,7 @@ case "$cmd" in
                                # back out of: source/qcsrc/server
                                ;;
                        release)
-                               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
+                               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                                ;;
                esac
                verbose rm -f Xonotic/source/*/fteqcc.log
@@ -1742,6 +1750,13 @@ case "$cmd" in
                                s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
                                s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
                        " defaultXonotic.cfg
+                       case "$RELEASETYPE" in
+                               release)
+                                       echo "" >> defaultXonotic.cfg
+                                       echo "// nicer menu" >> defaultXonotic.cfg
+                                       echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+                                       ;;
+                       esac
                        (
                                verbose cd gfx/menu/luminos
                                verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .