diff --git a/inc/status.inc b/inc/status.inc index 9de5e0f1..67fadb42 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -311,6 +311,13 @@ STATUS(){ DIVIDER . green 52 fi for docker in "${!dockers}"; do + if [ "${ST_ACTION}" != "report" ]; then + c=0; cw=${PRI_CW}; spc='' + spc1=`expr ${cw} - ${#NM_DOCKER_DESC[${docker}]}` + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + else + spc=' ' + fi tmp=${NM_SINGLESRVR_DOCKERS[${NTYPE}]} if [[ ${tmp[@]} =~ ${docker} ]]; then if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NTYPE}]}* ]]; then @@ -323,16 +330,7 @@ STATUS(){ SDCHK=true fi if [ ${SDCHK} == true ]; then - if [ "${ST_ACTION}" != "check" ]; then - if [ "${ST_ACTION}" != "report" ]; then - c=0; cw=${PRI_CW}; spc='' - spc1=`expr ${cw} - ${#NM_DOCKER_DESC[${docker}]}` - until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - else - spc=' ' - fi - echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: " - fi + [ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: " if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then if [ "$(${NCMD} docker ps -a | grep ${docker})" ]; then