X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-optionsfile;h=7693201b52b2c4c58e8dc8516624f20949974c9c;hb=17672a3aa67b451ffa37b5624485d809f85f5fc4;hp=7f14cef9e26ad8bdfe412c8a833dfd27c21f6fad;hpb=fd144c75e4f059765667f39f06def82e97dbb1f6;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-optionsfile b/misc/tools/xonotic-map-compiler-optionsfile
index 7f14cef9..7693201b 100755
--- a/misc/tools/xonotic-map-compiler-optionsfile
+++ b/misc/tools/xonotic-map-compiler-optionsfile
@@ -13,13 +13,21 @@ fi
 mkdir -p ~/.xonotic-map-compiler-autobuild/ # to store map compile times in
 tstart=`date +%s`
 
-lasttime=`cat ~/.xonotic-map-compiler-autobuild/${M:30} 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:30} # 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