X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-optionsfile;h=7693201b52b2c4c58e8dc8516624f20949974c9c;hp=5c3c05a9a7e42c3ee2e52858eff190f0f257b4b0;hb=aa9e1ce44130cc8b2e69b756ecdcc3f81069a4f5;hpb=33ea1239ecb684c8b75f3531a70d6a92d4c73d3f

diff --git a/misc/tools/xonotic-map-compiler-optionsfile b/misc/tools/xonotic-map-compiler-optionsfile
index 5c3c05a9..7693201b 100755
--- a/misc/tools/xonotic-map-compiler-optionsfile
+++ b/misc/tools/xonotic-map-compiler-optionsfile
@@ -2,7 +2,6 @@
 
 M=${1%.map}
 shift
-m=${M:30}
 
 sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true`
 if [ -n "$sz" ]; then
@@ -14,15 +13,21 @@ fi
 mkdir -p ~/.xonotic-map-compiler-autobuild/ # to store map compile times in
 tstart=`date +%s`
 
-if [ -f ~/.xonotic-map-compiler-autobuild/${m##*/} ] ; then # ${m##*/} : cut $m at "/", get latest field
-	lasttime=`cat ~/.xonotic-map-compiler-autobuild/${m##*/} 2>/dev/null` # oppress warnings if file doesn't exist
-	echo "Done in approximately $(($lasttime/60)) minutes."
+lasttime=`cat ~/.xonotic-map-compiler-autobuild/"${M##*/}".buildtime 2>/dev/null || true`
+if [ -n "$lasttime" ] ; then
+	echo "Predicted build time is $((($lasttime+59)/60)) minutes."
+	if [ -n "$IRCSPAM" ]; then
+		echo "Predicted build time is $((($lasttime+59)/60)) minutes." | $IRCSPAM >/dev/null 2>&1 || true
+	fi
 fi
 
-misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override "$@" || mapfail=true
+misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override "$@"
+status=$?
 
 tend=`date +%s`
-let tdelta=$tend-$tstart # compute time
-if  [[ ! ${mapfail} ]] ; then
-	echo $tdelta > ~/.xonotic-map-compiler-autobuild/${m##*/} # save time in ~/.xonotic-map-compiler-autobuild/mapname
+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