diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 67d8bd3f..45fb700d 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -736,11 +736,9 @@ DOWNLIST(){ MAINTENANCE_MODE(){ if [ "${1}" ] && [ "${NM_NODETYPES[${1^^}]}" != "" ]; then - ntss=${1^^} - ntypesel=(${ntss}) + ntypesel=(${1^^}) MM_ACTION=${2} else - ntss="" ntypesel=(${NM_NODE_TYPES[@]}) MM_ACTION=${1} fi @@ -750,7 +748,7 @@ MAINTENANCE_MODE(){ item_number=1 for NTYPE in "${ntypesel[@]}"; do - + srvcs=${NTYPE}_SERVICES_CHECK[@]; dockers=${NTYPE}_DOCKERS_CHECK[@] hosts=${NTYPE}_HOSTS[@] @@ -785,8 +783,6 @@ MAINTENANCE_MODE(){ echo -e "${idsCL[Green]} System Service(s)${idsCL[Default]}" DIVIDER . green 52 - srvcs=${NTYPE}_SERVICES_CHECK[@]; - srvcstotest="$(join_by " " ${!srvcs})" for srvc in "${!srvcs}"; do if [ ${item_number} -lt 10 ]; then isel=" ${item_number})"; elif [ ${item_number} -lt 100 ]; then isel=" ${item_number})"; else isel="${item_number})"; fi c=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done @@ -802,11 +798,10 @@ MAINTENANCE_MODE(){ ## DOCKER CHECK ######################## if [[ -v ${NTYPE}_DOCKERS_CHECK ]] && [ "${MM_ACTION}" != "services" ]; then - if [ "${MM_ACTION}" != "check" ]; then - [ "${MM_ACTION}" == "" ] && [ "${NM_SERVICES_CHECK[${NTYPE}]}" != "" ] && echo - echo -e "${idsCL[Green]} Docker Service(s)${idsCL[Default]}" - DIVIDER . green 52 - fi + [ "${MM_ACTION}" == "" ] && [ "${NM_SERVICES_CHECK[${NTYPE}]}" != "" ] && echo + echo -e "${idsCL[Green]} Docker Service(s)${idsCL[Default]}" + DIVIDER . green 52 + for docker in "${!dockers}"; do if [ ${item_number} -lt 10 ]; then isel=" ${item_number})"; elif [ ${item_number} -lt 100 ]; then isel=" ${item_number})"; else isel="${item_number})"; fi c=0; cw=${PRI_CW}; spc=''; spc1=`expr ${cw} - ${#NM_DOCKER_DESC[${docker}]}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done