diff --git a/inc/status.inc b/inc/status.inc index 72333ad2..d3a2d8f5 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -853,12 +853,12 @@ STATUS_SCANTIMES(){ fi done - scantimes_total_norm=`expr ${scantimes_norm} + ${scantimes_norm_xtr}` - scantimes_total_repl=`expr ${scantimes_repl} + ${scantimes_repl_xtr}` - 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}` + scantimes_total_norm=$(expr ${scantimes_norm} + ${scantimes_norm_xtr}) + scantimes_total_repl=$(expr ${scantimes_repl} + ${scantimes_repl_xtr}) + 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_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) @@ -892,13 +892,13 @@ STATUS_SCANTIMES(){ DIVIDER . lightCyan 60 echo -e "${idsCL[Green]} Service Checks `IDS_NUMBER_FORMAT ${scansfound_total_norm}` ${idsCL[Green]}(${average_total_norm}s)${spct}${idsCL[LightGreen]}${average_total_norm_disp}${idsCL[Default]}" DIVIDER . lightCyan 60 - echo -e "${idsCL[Cyan]} - Normal `IDS_NUMBER_FORMAT ${scansfound_norm}` ${idsCL[Cyan]}(${average_norm}s)${spcr}${idsCL[LightCyan]}${average_norm_disp}${idsCL[Default]}" - echo -e "${idsCL[Cyan]} - Long `IDS_NUMBER_FORMAT ${scansfound_norm_xtr}` ${idsCL[Cyan]}(${average_norm_xtr}s)${spcx}${idsCL[LightCyan]}${average_norm_xtr_disp}${idsCL[Default]}" + echo -e "${idsCL[Cyan]} - Normal `IDS_NUMBER_FORMAT ${scansfound_norm}` ${idsCL[Cyan]}(${average_norm}s)${spcr}${idsCL[LightCyan]}${average_norm_disp}${idsCL[Default]}" + echo -e "${idsCL[Cyan]} - Long `IDS_NUMBER_FORMAT ${scansfound_norm_xtr}` ${idsCL[Cyan]}(${average_norm_xtr}s)${spcx}${idsCL[LightCyan]}${average_norm_xtr_disp}${idsCL[Default]}" DIVIDER . lightCyan 60 echo -e "${idsCL[Green]} w/Replication `IDS_NUMBER_FORMAT ${scansfound_total_repl}` ${idsCL[Green]}(${average_total_repl}s)${spct}${idsCL[LightGreen]}${average_total_repl_disp}${idsCL[Default]}" DIVIDER . lightCyan 60 - echo -e "${idsCL[Cyan]} - Normal `IDS_NUMBER_FORMAT ${scansfound_repl}` ${idsCL[Cyan]}(${average_repl}s)${spcr}${idsCL[LightCyan]}${average_repl_disp}${idsCL[Default]}" - echo -e "${idsCL[Cyan]} - Long `IDS_NUMBER_FORMAT ${scansfound_repl_xtr}` ${idsCL[Cyan]}(${average_repl_xtr}s)${spcx}${idsCL[LightCyan]}${average_repl_xtr_disp}${idsCL[Default]}" + echo -e "${idsCL[Cyan]} - Normal `IDS_NUMBER_FORMAT ${scansfound_repl}` ${idsCL[Cyan]}(${average_repl}s)${spcr}${idsCL[LightCyan]}${average_repl_disp}${idsCL[Default]}" + echo -e "${idsCL[Cyan]} - Long `IDS_NUMBER_FORMAT ${scansfound_repl_xtr}` ${idsCL[Cyan]}(${average_repl_xtr}s)${spcx}${idsCL[LightCyan]}${average_repl_xtr_disp}${idsCL[Default]}" echo echo -e "${idsCL[LightCyan]}Longest scan from above : ${idsCL[Green]}(${longest_scantime}s) ${idsCL[LightGreen]}${longest_scantime_disp}${idsCL[Default]}" echo