voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2024-01-11 14:06:30 -06:00
parent f60a90cb58
commit 42a4b525dc
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.1.72-01112024' VERS='5.1.73-01112024'
NM_BETA=false 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 ' 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 '

20
inc/status.inc
View File

@@ -984,9 +984,9 @@ STATUS_SCANTIMES(){
if [ ${scansfound_total} -le 500 ]; then if [ ${scansfound_total} -le 500 ]; then
if [ ${scansfound_total} -gt 15 ]; 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 read -n1 choice
if [ "${choice^^}" == "Y" ]; then if [ "${choice^^}" == "A" ] || [ "${choice^^}" == "N" ] || [ "${choice}" == "R" ] || [ "${choice}" == "C" ]; then
echo -en "\r\033[K" echo -en "\r\033[K"
gofor=1 gofor=1
else else
@@ -1004,14 +1004,16 @@ STATUS_SCANTIMES(){
unset IFS unset IFS
echo -e "${idsCL[LightCyan]}Last ${lastscansnum} Scan Times\n${idsCL[Green]}------------------------------------------${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Last ${lastscansnum} Scan Times\n${idsCL[Green]}------------------------------------------${idsCL[Default]}"
for scan in "${last_scantimes[@]}"; do 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) scanrun=$(echo "${scan}" | cut -d '~' -f 3)
echo -en "${idsCL[White]} ${scandate} (${scantime}s) ${idsCL[Yellow]}$(SHOW_TIME ${scantime} s) " if [ "${choice^^}" == "A" ] || ([ "${choice}" == "N" ] && [ ${scanrun} -eq 0 ]) || ([ "${choice}" == "R" ] && [ ${scanrun} -eq 1 ]) || ([ "${choice}" == "C" ] && [ ${scanrun} -eq 2 ]); then
[ ${scanrun} -eq 1 ] && echo -n "<-- Replication Run " scandate=$(echo "${scan}" | cut -d '~' -f 1)
[ ${scanrun} -eq 2 ] && echo -n "<-- Replication & Clean Run " scantime=$(echo "${scan}" | cut -d '~' -f 2)
[ ${scantime} -ge 60 ] && echo -n "<-- Long Run" echo -en "${idsCL[White]} ${scandate} (${scantime}s) ${idsCL[Yellow]}$(SHOW_TIME ${scantime} s) "
echo -e "${idsCL[Default]}" [ ${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]}"
fi
done done
fi fi
fi fi