diff --git a/defaults.inc b/defaults.inc index 6d2ffdb8..30574be3 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.72-01112024' +VERS='5.1.73-01112024' 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 68df41db..c6322954 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -984,9 +984,9 @@ STATUS_SCANTIMES(){ if [ ${scansfound_total} -le 500 ]; then if [ ${scansfound_total} -gt 15 ]; then - echo -en "\n${idsCL[LightCyan]}List out these '${scansfound_total}' scan times? (y/N): ${idsCL[Default]}" + echo -en "\n${idsCL[LightCyan]}List out these '${scansfound_total}' scan times? (A)ll/(N)ormal/(R)epl/repl(C)lean/()none [default=no] : ${idsCL[Default]}" read -n1 choice - if [ "${choice^^}" == "Y" ]; then + if [ "${choice^^}" == "A" ] || [ "${choice^^}" == "N" ] || [ "${choice}" == "R" ] || [ "${choice}" == "C" ]; then echo -en "\r\033[K" gofor=1 else @@ -1004,14 +1004,16 @@ STATUS_SCANTIMES(){ unset IFS echo -e "${idsCL[LightCyan]}Last ${lastscansnum} Scan Times\n${idsCL[Green]}------------------------------------------${idsCL[Default]}" for scan in "${last_scantimes[@]}"; do - scandate=$(echo "${scan}" | cut -d '~' -f 1) - scantime=$(echo "${scan}" | cut -d '~' -f 2) scanrun=$(echo "${scan}" | cut -d '~' -f 3) - echo -en "${idsCL[White]} ${scandate} (${scantime}s) ${idsCL[Yellow]}$(SHOW_TIME ${scantime} s) " - [ ${scanrun} -eq 1 ] && echo -n "<-- Replication Run " - [ ${scanrun} -eq 2 ] && echo -n "<-- Replication & Clean Run " - [ ${scantime} -ge 60 ] && echo -n "<-- Long Run" - echo -e "${idsCL[Default]}" + if [ "${choice^^}" == "A" ] || ([ "${choice}" == "N" ] && [ ${scanrun} -eq 0 ]) || ([ "${choice}" == "R" ] && [ ${scanrun} -eq 1 ]) || ([ "${choice}" == "C" ] && [ ${scanrun} -eq 2 ]); then + scandate=$(echo "${scan}" | cut -d '~' -f 1) + scantime=$(echo "${scan}" | cut -d '~' -f 2) + echo -en "${idsCL[White]} ${scandate} (${scantime}s) ${idsCL[Yellow]}$(SHOW_TIME ${scantime} s) " + [ ${scanrun} -eq 1 ] && echo -n "<-- Replication Run " + [ ${scanrun} -eq 2 ] && echo -n "<-- Replication & Clean Run " + [ ${scantime} -ge 60 ] && echo -n "" + echo -e "${idsCL[Default]}" + fi done fi fi