From 37024e8ddbb7cf858de73934f6489e66bdf9c66c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 29 Nov 2024 22:52:30 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 5bff45ee..6fef0320 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -1026,9 +1026,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? (${idsCL[Yellow]}A${idsCL[LightCyan]})ll/(${idsCL[Yellow]}N${idsCL[LightCyan]})ormal/(${idsCL[Yellow]}R${idsCL[LightCyan]})epl/repl(${idsCL[Yellow]}C${idsCL[LightCyan]})lean [default=no] : ${idsCL[Default]}" + echo -en "\n${idsCL[LightCyan]}List out these '${scansfound_total}' scan times? (${idsCL[Yellow]}A${idsCL[LightCyan]})ll/(${idsCL[Yellow]}N${idsCL[LightCyan]})ormal/(${idsCL[Yellow]}L${idsCL[LightCyan]})ong/(${idsCL[Yellow]}R${idsCL[LightCyan]})epl/repl(${idsCL[Yellow]}C${idsCL[LightCyan]})lean [default=no] : ${idsCL[Default]}" read -n1 choice - if [ "${choice^^}" == "A" ] || [ "${choice^^}" == "N" ] || [ "${choice^^}" == "R" ] || [ "${choice^^}" == "C" ]; then + if [ "${choice^^}" == "A" ] || [ "${choice^^}" == "N" ] || [ "${choice^^}" == "R" ] || [ "${choice^^}" == "C" ] || [ "${choice^^}" == "L" ]; then echo -en "\r\033[K" gofor=1 else @@ -1047,9 +1047,9 @@ STATUS_SCANTIMES(){ echo -e "${idsCL[LightCyan]}Last ${lastscansnum} Scan Times\n${idsCL[Green]}------------------------------------------${idsCL[Default]}" for scan in "${last_scantimes[@]}"; do scanrun=$(echo "${scan}" | cut -d '~' -f 3) - 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) + scandate=$(echo "${scan}" | cut -d '~' -f 1) + scantime=$(echo "${scan}" | cut -d '~' -f 2) + if [ "${choice^^}" == "A" ] || ([ "${choice^^}" == "N" ] && [ ${scanrun} -eq 0 ]) || ([ "${choice^^}" == "R" ] && [ ${scanrun} -eq 1 ]) || ([ "${choice^^}" == "C" ] && [ ${scanrun} -eq 2 ]) || ([ "${choice^^}" == "L" ] && ([ ${scanrun} -eq 0 ] && [ ${scantime} -gt 60 ] || [ ${scanrun} -gt 0 ] && [ ${scantime} -gt 70 ])); then 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 "