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 ef09a530cc755318bf67c158d799e6984a2e0d53..59ef5eff6634bc8dd7fd428d0dfd976df1579cc4 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -4,22 +4,20 @@ case "$cmd" in
                misc/tools/xonotic-map-compiler-autobuild download
                ;;
        compile-map)
-               if [ -n "$1" ] ; then
+               if [ $# -eq 0 ] ; then
                        msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
                        msg "For example: ./all compile-map dance xoylent"
                fi
-               if [ ! -f "netradiant/install/q3map2.x86" ] ; then
+               if ! [ -f "netradiant/install/q3map2.x86" ] ; then
                        msg "q3map2 needed! Building netradiant..."
-                       cd netradiant
-                       make
-                       cd ../
+                       make -C netradiant install/q3map2.x86
                fi
-               for mapfile in $@ ; do
-                               mapfile="data/xonotic-maps.pk3dir/maps/$1.map"
+               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 $mapfile `grep "^-" $mapfile.options`
+                               time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
                        fi
                done
                ;;