make adminmerge more covnenient

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 6bbac8fe7df098081e5af0f300833436d44a9972..e9134bf779b19e058e4adfda906b18ad90d67fdf 100755 (executable)
--- a/all
+++ b/all
@@ -463,6 +463,9 @@ case "$cmd" in
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
                        export PATH="$d0/misc/buildfiles/w32:$PATH"
+               elif [ x"`uname`" = x"Darwin" ]; then
+                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+                       client=-sdl
                else
                        client=-sdl
                fi
@@ -559,6 +562,9 @@ case "$cmd" in
                rm -rf "$patchdir"
                ;;
        admin-merge)
+               if [ "$#" = 2 ]; then
+                       set -- "${1%%/*}" "${1#*/}"
+               fi
                for d in $repos; do
                        enter "$d0/$d" verbose
                        git rev-parse "$1/$2" || continue