diff --git a/inc/status.inc b/inc/status.inc index e228d6f3..2e5f5013 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -818,6 +818,7 @@ STATUS_SCANTIMES(){ echo -en "${idsCL[Yellow]}Pulling data and calculating average scan times for the last '${LAST}' scans ... " lastscantime=$(tail -n 1 ${NM_LOGFOLDER}/status-check.scantimes) + lastscantime=${lastscantime#*~} scantimes=$(tail -n ${LAST} ${NM_LOGFOLDER}/status-check.scantimes) IFS=$'\n' read -rd '' -a scantimes <<<"${scantimes}" @@ -859,8 +860,8 @@ STATUS_SCANTIMES(){ # c=0; spcx=''; spc1=`expr ${cw} - ${#average_xtr}`; until [ $c = ${spc1} ]; do spcx="${spcx} "; c=`expr $c + 1`; done # average_disp=$(SHOW_TIME ${average} s) # c=0; spcT=''; spc1=`expr ${cw} - ${#average}`; until [ $c = ${spc1} ]; do spct="${spct} "; c=`expr $c + 1`; done - # lastscantime_disp=$(SHOW_TIME ${lastscantime#*~} s) - # c=0; spcb=''; spc1=`expr ${cw} - ${lastscantime#*~}`; until [ $c = ${spc1} ]; do spcb="${spcb} "; c=`expr $c + 1`; done + # lastscantime_disp=$(SHOW_TIME ${lastscantime} s) + # c=0; spcb=''; spc1=`expr ${cw} - ${lastscantime}`; until [ $c = ${spc1} ]; do spcb="${spcb} "; c=`expr $c + 1`; done average_norm_disp=$(SHOW_TIME ${average_norm} s) c=0; spca=''; spc1=`expr ${cw} - ${#average_norm}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done @@ -870,7 +871,8 @@ STATUS_SCANTIMES(){ c=0; spcx=''; spc1=`expr ${cw} - ${#average_xtr}`; until [ $c = ${spc1} ]; do spcx="${spcx} "; c=`expr $c + 1`; done average_disp=$(SHOW_TIME ${average} s) c=0; spcT=''; spc1=`expr ${cw} - ${#average_disp}`; until [ $c = ${spc1} ]; do spct="${spct} "; c=`expr $c + 1`; done - lastscantime_disp=$(SHOW_TIME ${lastscantime#*~} s) + + lastscantime_disp=$(SHOW_TIME ${lastscantime} s) c=0; spcb=''; spc1=`expr ${cw} - ${#lastscantime#*~}`; until [ $c = ${spc1} ]; do spcb="${spcb} "; c=`expr $c + 1`; done @@ -884,7 +886,7 @@ STATUS_SCANTIMES(){ echo -e "${idsCL[Cyan]} - w/Replication - '${scansfound_repl}' : ${idsCL[LightGreen]}(${average_repl}s)${spcr}${idsCL[Green]}${average_repl_disp}${idsCL[Default]}\n" echo -e "${idsCL[Cyan]} - Extreme Runs - '${scansfound_xtr}' : ${idsCL[LightGreen]}(${average_xtr}s)${spcx}${idsCL[Green]}${average_xtr_disp}${idsCL[Default]}\n" echo - echo -e "${idsCL[LightCyan]}Last Scan Time : ${idsCL[LightGreen]}(${lastscantime#*~}s)${spcb}${idsCL[Green]}${lastscantime_disp}${idsCL[Default]}\n" + echo -e "${idsCL[LightCyan]}Last Scan Time : ${idsCL[LightGreen]}(${lastscantime}s)${spcb}${idsCL[Green]}${lastscantime_disp}${idsCL[Default]}\n" echo -e "${idsCL[LightCyan]}Last Scan Check : ${idsCL[LightGreen]}${last_scancheck}${idsCL[Default]}\n" echo -e "${idsCL[LightCyan]}Last Replication Check : ${idsCL[LightGreen]}${last_replcheck}${idsCL[Default]}\n"