diff --git a/inc/status.inc b/inc/status.inc index 103f0d88..7fe13048 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -858,7 +858,7 @@ STATUS_SCANTIMES(){ scantimes_total=$(expr ${scantimes_total_norm} + ${scantimes_total_repl}) scansfound_total_norm=$(expr ${scansfound_norm} + ${scansfound_norm_xtr}) scansfound_total_repl=$(expr ${scansfound_repl} + ${scansfound_repl_xtr}) - scansfound_total=$(expr ${scansfound_total_norm} + ${scansfound_total_rep}) + scansfound_total=$(expr ${scansfound_total_norm} + ${scansfound_total_repl}) [ ${scansfound_norm} -eq 0 ] && average_norm=0 || average_norm=$(ROUND_NUMBER $(bc <<< "scale=2; ${scantimes_norm}/${scansfound_norm}") 0) [ ${scansfound_norm_xtr} -eq 0 ] && average_norm_xtr=0 || average_norm_xtr=$(ROUND_NUMBER $(bc <<< "scale=2; ${scantimes_norm_xtr}/${scansfound_norm_xtr}") 0) @@ -867,9 +867,7 @@ STATUS_SCANTIMES(){ [ ${scansfound_repl_xtr} -eq 0 ] && average_repl_xtr=0 || average_repl_xtr=$(ROUND_NUMBER $(bc <<< "scale=2; ${scantimes_repl_xtr}/${scansfound_repl_xtr}") 0) [ ${scansfound_total_repl} -eq 0 ] && average_total_repl=0 || average_total_repl=$(ROUND_NUMBER $(bc <<< "scale=2; ${scantimes_total_repl}/${scansfound_total_repl}") 0) [ ${scansfound_total} -eq 0 ] && average_total=0 || average_total=$(ROUND_NUMBER $(bc <<< "scale=2; ${scantimes_total}/${scansfound_total}") 0) - - echo "HERE: ${scansfound_norm} - ${scansfound_norm_xtr} - ${scansfound_total_norm} - ${scansfound_repl} - ${scansfound_repl_xtr} - ${scansfound_total_repl} - ${scansfound_total}" - + cw=`expr $(echo "${#average_norm} ${#average_norm_xtr} ${#average_repl} ${#average_repl_xtr} ${#average_total_norm} ${#average_total_replt} ${#average_total}" | grep -oE '[0-9]+' | sort -n | tail -n 1) + 1` average_norm_disp=$(SHOW_TIME ${average_norm} s); c=0; spcAND=''; spc1=`expr ${cw} - ${#average_norm}`; until [ $c = ${spc1} ]; do spcAND="${spcAND} "; c=`expr $c + 1`; done average_norm_xtr_disp=$(SHOW_TIME ${average_norm_xtr} s); c=0; spcANXD=''; spc1=`expr ${cw} - ${#average_norm_xtr}`; until [ $c = ${spc1} ]; do spcANXD="${spcANXD} "; c=`expr $c + 1`; done