Clarify autobuild-bsp time estimate message

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler-optionsfile

diff --git a/misc/tools/xonotic-map-compiler-optionsfile b/misc/tools/xonotic-map-compiler-optionsfile
index eb614eb2a3ca27245ccc4389d90e4a973414b198..7693201b52b2c4c58e8dc8516624f20949974c9c 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-optionsfile
+++ b/misc/tools/xonotic-map-compiler-optionsfile
@@ -13,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:30} ] ; then
-       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