Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

This commit is contained in:
Rudolf Polzer 2013-06-23 18:21:23 +02:00
commit 100c8c4a33

View File

@ -9,4 +9,25 @@ if [ -n "$sz" ]; then
else
minimap_override=
fi
mkdir -p ~/.xonotic-map-compiler-autobuild/ # to store map compile times in
tstart=`date +%s`
lasttime=`cat ~/.xonotic-map-compiler-autobuild/"${M##*/}".buildtime 2>/dev/null || true`
if [ -n "$lasttime" ] ; then
echo "Done in approximately $((($lasttime+59)/60)) minutes."
if [ -n "$IRCSPAM" ]; then
echo "Done in approximately $((($lasttime+59)/60)) minutes." | $IRCSPAM || true
fi
fi
misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override "$@"
status=$?
tend=`date +%s`
tdelta=$(($tend - $tstart)) # compute time
if [ $status -eq 0 ] ; then
echo "$tdelta" > ~/.xonotic-map-compiler-autobuild/"${M##*/}".buildtime # save time in ~/.xonotic-map-compiler-autobuild/mapname
fi
exit $status