allow the path to xonotic.brand to come from XONOTIC_BRANDFILE

diff --git a/all b/all
index d5757dd249f1acdf7bb1111c2efa608172fb1c91..ba0fd468722a6a258ea1f5b179060b17f57f2c44 100755 (executable)
--- a/all
+++ b/all
@@ -953,7 +953,7 @@ case "$cmd" in
                        esac
                        # now rebrand the binaries...
                        for f in $targetfiles; do
-                               verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "$d0/misc/tools/xonotic.brand" "${f##*:}" || true
+                               verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
                        done
                fi
                ;;

diff --git a/misc/tools/rebrand-darkplaces-engine.sh b/misc/tools/rebrand-darkplaces-engine.sh
index 8208d4841f01836b1e74cae04fdca92de7d9420d..6f6a76921336aa9b810ee8cde9b0ec8c88f36992 100755 (executable)
--- a/misc/tools/rebrand-darkplaces-engine.sh
+++ b/misc/tools/rebrand-darkplaces-engine.sh
@@ -11,6 +11,10 @@ icon_icns=Darkplaces.app/Contents/Resources/Darkplaces.icns
 icon_ico=darkplaces.ico
 icon_xpm=darkplaces.xpm
 
+if [ -z "$1" ]; then
+       echo "Usage: $0 brandfile binaries..."
+       exit
+fi
 . "$1"; shift
 
 d=`pwd`