From 1b4e1c363ba6d627a891b3e68ac103dc5f345f9e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 16 Dec 2023 23:36:16 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 81b1aebc..e13dae7a 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -852,7 +852,7 @@ STATUS_SCANTIMES(){ [ ${scansfound} -eq 0 ] && average=0 || average=$(ROUND_NUMBER $(bc <<< "scale=2; ${scantimes_total}/${scansfound}") 0) - cw=`expr $(echo "${#average_norm} ${#average_repl} ${#average_xtr} ${#average}" | grep -oE '[0-9]+' | sort -n | tail -n 1) + 2` + cw=`expr $(echo "${#average_norm} ${#average_repl} ${#average_xtr} ${#average}" | grep -oE '[0-9]+' | sort -n | tail -n 1) + 1` 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 average_repl_disp=$(SHOW_TIME ${average_repl} s) @@ -863,9 +863,7 @@ STATUS_SCANTIMES(){ 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 longest_scantime_disp=$(SHOW_TIME ${longest_scantime} s) - c=0; spcl=''; spc1=`expr ${cw} - ${#longest_scantime}`; until [ $c = ${spc1} ]; do spcl="${spcl} "; c=`expr $c + 1`; done [ -f ${NM_TMPFOLDER}/.replcheck ] && last_replcheck=$(date -d @$(stat -c %Y ${NM_TMPFOLDER}/.replcheck) "+%Y-%m-%d %H:%M:%S") || last_replcheck="" @@ -880,9 +878,9 @@ STATUS_SCANTIMES(){ echo -e "${idsCL[Cyan]} - w/Replication `IDS_NUMBER_FORMAT ${scansfound_repl}` ${idsCL[LightCyan]}(${average_repl}s)${spcr}${idsCL[Cyan]}${average_repl_disp}${idsCL[Default]}" echo -e "${idsCL[Cyan]} - Extreme runs `IDS_NUMBER_FORMAT ${scansfound_xtr}` ${idsCL[LightCyan]}(${average_xtr}s)${spcx}${idsCL[Cyan]}${average_xtr_disp}${idsCL[Default]}" echo - echo -e "${idsCL[LightCyan]}Longest scan from above : ${idsCL[LightGreen]}(${longest_scantime}s)${spcl}${idsCL[Green]}${longest_scantime_disp}${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Longest scan from above : ${idsCL[LightGreen]}(${longest_scantime}s) ${idsCL[Green]}${longest_scantime_disp}${idsCL[Default]}" echo - echo -e "${idsCL[LightCyan]}Last Scan Time : ${idsCL[LightGreen]}(${lastscantime}s)${spcb}${idsCL[Green]}${lastscantime_disp}${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Last Scan Time : ${idsCL[LightGreen]}(${lastscantime}s) ${idsCL[Green]}${lastscantime_disp}${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Last Scan Check : ${idsCL[LightGreen]}${last_scancheck}${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Last Replication Check : ${idsCL[LightGreen]}${last_replcheck}${idsCL[Default]}"