From 33ea1239ecb684c8b75f3531a70d6a92d4c73d3f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Kr=C3=BCger?= Date: Tue, 18 Jun 2013 18:02:25 +0200 Subject: [PATCH] xonotic-map-compiler-optionsfile: fix for mapnames with slashes. ./all compile-map hudsetup/hudsetup works now! --- misc/tools/xonotic-map-compiler-optionsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/misc/tools/xonotic-map-compiler-optionsfile b/misc/tools/xonotic-map-compiler-optionsfile index eb614eb2..5c3c05a9 100755 --- a/misc/tools/xonotic-map-compiler-optionsfile +++ b/misc/tools/xonotic-map-compiler-optionsfile @@ -2,6 +2,7 @@ M=${1%.map} shift +m=${M:30} sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true` if [ -n "$sz" ]; then @@ -13,8 +14,8 @@ 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 +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." fi @@ -23,5 +24,5 @@ misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1 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 + echo $tdelta > ~/.xonotic-map-compiler-autobuild/${m##*/} # save time in ~/.xonotic-map-compiler-autobuild/mapname fi -- 2.39.2