From 0aa504aeae94749038edb9ec6aa0120ec688fa30 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 16 Dec 2023 23:24:51 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index d3920687..af09d795 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.28-12162023' +VERS='5.1.29-12162023' NM_BETA=false noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck ' diff --git a/inc/status.inc b/inc/status.inc index 9b9aa978..6eea54be 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -867,13 +867,13 @@ STATUS_SCANTIMES(){ [ -f ${NM_LOGFOLDER}/status-check.scantimes ] && last_scancheck=$(date -d @$(stat -c %Y ${NM_LOGFOLDER}/status-check.scantimes) "+%Y-%m-%d %H:%M:%S") || last_scancheck="" echo -en "\r\033[K" - echo -e "${idsCL[LightCyan]}Scan Type Scans Average Scantime${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Scan Type Scans Average Scantime${idsCL[Default]}" DIVIDER . lightCyan 60 - echo -e "${idsCL[Green]}Average for last ${scansfound} ${idsCL[LightGreen]}(${average}s)${spct}${idsCL[Green]}${average_disp}${idsCL[Default]}" + echo -e "${idsCL[Green]}Average for last `IDS_NUMBER_FORMAT ${scansfound}` ${idsCL[LightGreen]}(${average}s)${spct}${idsCL[Green]}${average_disp}${idsCL[Default]}" DIVIDER . lightCyan 60 - echo -e "${idsCL[Cyan]} - Normal runs ${scansfound_norm} ${idsCL[LightCyan]}(${average_norm}s)${spca}${idsCL[Cyan]}${average_norm_disp}${idsCL[Default]}" - echo -e "${idsCL[Cyan]} - w/Replication ${scansfound_repl} ${idsCL[LightCyan]}(${average_repl}s)${spcr}${idsCL[Cyan]}${average_repl_disp}${idsCL[Default]}" - echo -e "${idsCL[Cyan]} - Extreme runs ${scansfound_xtr} ${idsCL[LightCyan]}(${average_xtr}s)${spcx}${idsCL[Cyan]}${average_xtr_disp}${idsCL[Default]}" + echo -e "${idsCL[Cyan]} - Normal runs `IDS_NUMBER_FORMAT ${scansfound_norm}` ${idsCL[LightCyan]}(${average_norm}s)${spca}${idsCL[Cyan]}${average_norm_disp}${idsCL[Default]}" + 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]}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"