fix arg count checking

[xonotic/xonotic.git] / misc / tools / all / xonotic.subr

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 6995ad1b6c96d053aac6f706597dc1bd23fc628a..59ef5eff6634bc8dd7fd428d0dfd976df1579cc4 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -4,19 +4,22 @@ case "$cmd" in
                misc/tools/xonotic-map-compiler-autobuild download
                ;;
        compile-map)
-               mapfile="data/xonotic-maps.pk3dir/maps/$1.map"
-               if [ ! -f "netradiant/install/q3map2.x86" ] ; then
-                       msg "q3map2 needed! Building netradiant..."
-                       cd netradiant
-                       make
-                       cd ../
+               if [ $# -eq 0 ] ; then
+                       msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
+                       msg "For example: ./all compile-map dance xoylent"
                fi
-               if [ ! -f "$mapfile" ] ; then
-                       msg "ERROR, $mapfile not found!"
-                       exit 2
-               else
-                       time misc/tools/xonotic-map-compiler_from_all $mapfile
+               if ! [ -f "netradiant/install/q3map2.x86" ] ; then
+                       msg "q3map2 needed! Building netradiant..."
+                       make -C netradiant install/q3map2.x86
                fi
+               for mapfile in "$@"; do
+                       mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
+                       if [ ! -f "$mapfile" ] ; then
+                               msg "ERROR, $mapfile not found!"
+                       else
+                               time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
+                       fi
+               done
                ;;
        compile)
                cleand0=false
@@ -339,6 +342,7 @@ case "$cmd" in
                $ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
                $ECHO "  $SELF update-maps"
                $ECHO "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+               $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;
        *)