diff --git a/defaults.inc b/defaults.inc index cb64eb17..b23f84fe 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.17.56-12052023' +VERS='4.17.57-12052023' 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/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 90fdfb86..fe9fd9d0 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -655,11 +655,11 @@ DOWNLIST(){ else echo -e "${idsCL[LightGreen]}Current List of Items Down...${idsCL[Default]}" DIVIDER false yellow 95 - if [ "${1}" != "ignore" ]; then - echo -e "${idsCL[Yellow]}Service/Host Host Down_Time${idsCL[Default]}" - else + # if [ "${1}" != "ignore" ]; then + # echo -e "${idsCL[Yellow]}Service/Host Host Down_Time${idsCL[Default]}" + # else echo -e "${idsCL[Yellow]} Service/Host Host Down_Time Notifications${idsCL[Default]}" - fi + # fi DIVIDER false yellow 95 until [ "${choice^^}" = "E" ]; do @@ -694,9 +694,9 @@ DOWNLIST(){ c=0; spc2=''; spc1=${cw2}-${#host} until [ $c = ${spc1} ]; do spc2="${spc2} "; c=`expr $c + 1`; done - if [ "${1}" != "ignore" ]; then - echo -e "${idsCL[LightRed]}${itemname}${spc}${host}${spc2}$(SHOW_TIME ${toterrtime})${idsCL[Default]}" - else + # if [ "${1}" != "ignore" ]; then + # echo -e "${idsCL[LightRed]}${itemname}${spc}${host}${spc2}$(SHOW_TIME ${toterrtime})${idsCL[Default]}" + # else if [ "${choice}" -gt 0 ] 2>/dev/null && [ ${is} -eq ${choice} ]; then [ ! -f ${NM_TMPFOLDER}/${ditem}.disable ] && touch ${NM_TMPFOLDER}/${ditem}.disable || rm -f ${NM_TMPFOLDER}/${ditem}.disable fi @@ -707,18 +707,18 @@ DOWNLIST(){ c=0; spc3='' until [ $c = `expr 26 - ${#time}` ]; do spc3="${spc3} "; ((c++)); done echo -e "\033[K${idsCL[LightRed]}${idsST[Bold]}${ignsel}${idsST[Reset]}${idsCL[LightRed]}${itemname}${spc}${host}${spc2}${time}${spc3}${dstatus}${idsCL[Default]}" - fi + # fi DIVIDER false darkGray 95 ((is++)) done - if [ "${1}" == "ignore" ]; then + # if [ "${1}" == "ignore" ]; then echo -en "\n\033[K${idsCL[LightCyan]}Enter # to change notifications [${idsCL[Default]}(${idsCL[LightYellow]}E${idsCL[Default]})xit${idsCL[LightCyan]}] : ${idsCL[Default]}" read -n 1 choice - else - choice=E - fi + # else + # choice=E + # fi [ "${choice^^}" == "E" ] && break echo -e "\033[$(echo "scale=1; (${#DOWNLIST[@]}*2)+2" | bc)A"