diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 52a70f1b..2107b9dd 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -85,7 +85,7 @@ STATUS(){ else spc=' ' fi - echo -en " ${NM_SERVICES[${srvc}]}$spc: " + echo -en " ${NM_SERVICES[${srvc}]}${spc}: " fi if [ "$(systemctl is-active ${srvc})" != "active" ]; then @@ -276,11 +276,16 @@ STATUS(){ for docker in "${!dockers}"; do if [ "${ST_ACTION}" != "check" ]; then - c=0; cw=30; spc='' - spc1=`expr ${cw} - ${#NM_DOCKERS[${docker}]}` - until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + if [ "${ST_ACTION}" != "report" ]; then + c=0; cw=30; spc='' + spc1=`expr ${cw} - ${#NM_DOCKERS[${docker}]}` + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + else + spc=' ' + fi echo -en " ${NM_DOCKERS[${docker}]}$spc: " fi + if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then if [ "$(${NCMD} docker ps -aq -f status=exited -f name=${docker})" ]; then ${NCMD} docker rm ${docker} >/dev/null 2>&1