Merge remote branch 'origin/master' into samual/updatecommands

diff --git a/misc/tools/rsync-updater/update-xonotic.bat b/misc/tools/rsync-updater/update-xonotic.bat
index db76dd522bcda263f02ae83a876cd7391b159d53..fb3972a53c8425c0729029b1b10d7b252fba55fe 100644 (file)
--- a/misc/tools/rsync-updater/update-xonotic.bat
+++ b/misc/tools/rsync-updater/update-xonotic.bat
@@ -75,6 +75,7 @@ set excludes=%excludes% --exclude=/fteqcc/fteqcc.osx
 \r
 if "%ProgramFiles(x86)%" == "" goto bit32\r
 :bit64\r
+       if not "%XONOTIC_INCLUDE_32BIT%" == "" goto endbit\r
        set excludes=%excludes% --exclude=/xonotic.exe\r
        set excludes=%excludes% --exclude=/xonotic-sdl.exe\r
        set excludes=%excludes% --exclude=/xonotic-dedicated.exe\r

diff --git a/misc/tools/rsync-updater/update-xonotic.sh b/misc/tools/rsync-updater/update-xonotic.sh
index 095e2a6fd350d9e8f256ecbf14660bfc9d292c3d..d34c7e34842a28f9e100109cb701b88e5c9c6121 100755 (executable)
--- a/misc/tools/rsync-updater/update-xonotic.sh
+++ b/misc/tools/rsync-updater/update-xonotic.sh
@@ -62,8 +62,10 @@ case `uname`:`uname -m` in
                excludes="$excludes --exclude=/Xonotic*.app"
                excludes="$excludes --exclude=/xonotic-osx-*"
                excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
-               excludes="$excludes --exclude=/xonotic-linux32-*"
-               excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
+               if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
+                       excludes="$excludes --exclude=/xonotic-linux32-*"
+                       excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
+               fi
                ;;
        Linux:i?86)
                excludes="$excludes --exclude=/Xonotic*.app"