diff --git a/inc/status.inc b/inc/status.inc index ba511f83..ef9b5925 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -3,37 +3,46 @@ STATUS(){ start=$(date +%s) log_start=$(date "+%Y-%m-%d %H:%M:%S") - if [ "${1}" == "report" ] || [ "${1}" == "" ]; then - ST_ACTION=${1} - ntypesel=(${NM_NODE_TYPES[@]}) - # if [ "${NM_NODETYPES[${ST_ACTION^^}]}" != "" ]; then - # ntss=${ST_ACTION^^} - # ntypesel=(${ntss}) - # ST_ACTION=${2} - # else - # ntss="" - # ntypesel=(${NM_NODE_TYPES[@]}) - # [ "${1}" == "sync" ] && ST_ACTION=repl || ST_ACTION=${1} - # fi + # if [ "${1}" == "report" ] || [ "${1}" == "" ]; then + # ST_ACTION=${1} + # ntypesel=(${NM_NODE_TYPES[@]}) + # # if [ "${NM_NODETYPES[${ST_ACTION^^}]}" != "" ]; then + # # ntss=${ST_ACTION^^} + # # ntypesel=(${ntss}) + # # ST_ACTION=${2} + # # else + # # ntss="" + # # ntypesel=(${NM_NODE_TYPES[@]}) + # # [ "${1}" == "sync" ] && ST_ACTION=repl || ST_ACTION=${1} + # # fi + # else + # while [ $# -gt 0 ]; do + # case "$1" in + # -site) DEL_SITE=${2};; + # -ssl) DEL_SSL=${2};; + # -*) + # echo -e "Usage: ${idsCL[Yellow]}[nodemgmt or nmg] status {opt}${idsCL[Default]} {" + # width=35 + # printf "%-${width}s- %s\n" " -site {FQDN address}" "(*required)" + # printf "%-${width}s- %s\n" " -site {FQDN address}" "(*required)" + # printf "%-${width}s- %s\n" " -site {FQDN address}" "(*required)" + # printf "%-${width}s- %s\n" " -ssl {yes or [no]}" "Delete SSL certs as well" + # printf "%-${width}s- %s\n" " -list" "List sites (same as running nodemgmt delsites)" + # echo -e "}\n" + # exit 0 + # ;; + # esac + # shift + # done + # fi + if [ "${NM_NODETYPES[${ST_ACTION^^}]}" != "" ]; then + ntss=${ST_ACTION^^} + ntypesel=(${ntss}) + ST_ACTION=${2} else - while [ $# -gt 0 ]; do - case "$1" in - -site) DEL_SITE=${2};; - -ssl) DEL_SSL=${2};; - -*) - echo -e "Usage: ${idsCL[Yellow]}[nodemgmt or nmg] status {opt}${idsCL[Default]} {" - width=35 - printf "%-${width}s- %s\n" " -site {FQDN address}" "(*required)" - printf "%-${width}s- %s\n" " -site {FQDN address}" "(*required)" - printf "%-${width}s- %s\n" " -site {FQDN address}" "(*required)" - printf "%-${width}s- %s\n" " -ssl {yes or [no]}" "Delete SSL certs as well" - printf "%-${width}s- %s\n" " -list" "List sites (same as running nodemgmt delsites)" - echo -e "}\n" - exit 0 - ;; - esac - shift - done + ntss="" + ntypesel=(${NM_NODE_TYPES[@]}) + [ "${1}" == "sync" ] && ST_ACTION=repl || ST_ACTION=${1} fi PRI_CW=40