]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - misc/tools/all/xonotic.subr
Use time only if it exists.
[xonotic/xonotic.git] / misc / tools / all / xonotic.subr
index 88efde2514de309b49997a86fb2f259361ce10a5..7be8fa065c3c6f50994a3dba96ce4b755e1829e6 100644 (file)
@@ -10,14 +10,14 @@ case "$cmd" in
                fi
                if ! [ -f "netradiant/install/q3map2" ] ; then
                        msg "q3map2 needed! Building netradiant..."
-                       make -C netradiant install/q3map2
+                       make -C netradiant BUILD=native install/q3map2
                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"
+                               $time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
                        fi
                done
                ;;
@@ -333,10 +333,10 @@ case "$cmd" in
                        set -- catchsegv "$@"
                fi
                if [ x"$USE_RLWRAP" != x"no" ] && which rlwrap >/dev/null 2>&1; then
-                       set -- rlwrap -A -g '^quit' -q "\"" -r -S ']' -w 100 "$@"
+                       set -- rlwrap -A -g '^quit' -q "\"" -s 10000 -S ']' -w 100 "$@"
                fi
                rm -f xonotic.core
-               "$@" || true
+               $time "$@" || true
                if [ -f xonotic.core ]; then
                        if yesno "The program has CRASHED. Do you want to examine the core dump?"; then
                                gdb "$binary" xonotic.core