diff --git a/defaults.inc b/defaults.inc index 08810c08..2e519847 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.4-12112023' +VERS='5.1.5-12112023' 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 5762a98b..34a5c389 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -635,11 +635,11 @@ DOWNLIST(){ else echo -e "${idsCL[LightGreen]}Current List of Items Down...${idsCL[Default]}" DIVIDER false yellow 110 - # if [ "${1}" != "ignore" ]; then - # echo -e "${idsCL[Yellow]}Service/Host Host Down_Time${idsCL[Default]}" - # else + if [ "${1}" != "report" ]; then + echo -e "${idsCL[Yellow]}Service/Host Host Down_Time${idsCL[Default]}" + else echo -e "${idsCL[Yellow]} [Type] [Host/Service/Docker Name] [Host] [Down_Time] [Notifications]${idsCL[Default]}" - # fi + fi DIVIDER false yellow 110 until [ "${choice^^}" = "E" ]; do @@ -686,9 +686,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}" != "report" ]; 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 @@ -699,18 +699,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]}${itemtype}${spca}${itemname}${spc}${host}${spc2}${time}${spc3}${dstatus}${idsCL[Default]}" - # fi + fi DIVIDER false darkGray 110 ((is++)) done - # if [ "${1}" == "ignore" ]; then + if [ "${1}" != "report" ]; 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"