diff --git a/mm-scripts.sh b/mm-scripts.sh index 56565dd..0122cd1 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -462,7 +462,7 @@ MMSTATUS(){ spc1=$((${cw_spc}-${#MM_SERVICES[${srvc}]})) until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done dispname="${MM_SERVICES[${srvc}]/(/${idsCL[LightCyan]}(}" - echo -en " ${idsCL[White]}${dispname}$spc: ${idsCL[Default]}" + echo -en " ${idsCL[White]}${dispname}${spc}${idsCL[White]}: ${idsCL[Default]}" if [ "$(systemctl is-active ${srvc})" != "active" ] && [ "${srvc}" != "wireguard" ]; then if [ -f ${MMFOLDER}/mm.noservices ]; then @@ -486,13 +486,13 @@ MMSTATUS(){ msg=" |- ${idsCL[Default]}0.0.0.0 Gateway" c=0; spc=''; spc1=$((${cw_spc}-${#msg}+6)) until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -en "${idsCL[White]}${msg}${idsCL[LightCyan]}${spc} : ${idsCL[Default]}" + echo -en "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Default]}" echo -e "${idsCL[Green]}$zerogw${idsCL[Default]}" msg=" |- ${idsCL[Default]}DEFAULT Gateway" c=0; spc=''; spc1=$((${cw_spc}-${#msg}+6)) until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -en "${idsCL[White]}${msg}${spc}${idsCL[LightCyan]} : ${idsCL[Default]}" + echo -en "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Default]}" if [ "${zerogw}" == "${defaultgw}" ] && [ "${zerogw}" == "${VPN_INTERFACE}" ]; then echo -e "${idsCL[Green]}$defaultgw${idsCL[Default]}" @@ -522,13 +522,13 @@ MMSTATUS(){ msg=" |- ${idsCL[Default]}0.0.0.0 Gateway" c=0; spc=''; spc1=$((${cw_spc}-${#msg}+6)) until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -en "${idsCL[White]}${msg}${spc}${idsCL[LightCyan]} : ${idsCL[Default]}" + echo -en "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Default]}" echo -e "${idsCL[Green]}$zerogw${idsCL[Default]}" msg=" |- ${idsCL[Default]}DEFAULT Gateway" c=0; spc=''; spc1=$((${cw_spc}-${#msg}+6)) - until [ $c = ${spc1} ]; do spc="${spc}${idsCL[LightCyan]} "; c=`expr $c + 1`; done - echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Default]}" if [ "${zerogw}" == "${defaultgw}" ] && [ "${zerogw}" == "${VPN_INTERFACE}" ]; then echo -e "${idsCL[Green]}$defaultgw${idsCL[Default]}" @@ -547,7 +547,7 @@ MMSTATUS(){ msg=" |- ${idsCL[Default]}Verify routing through VPN" c=0; spc=''; spc1=$((${cw_spc}-${#msg}+6)) until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -en "${idsCL[White]}${msg}${spc}${idsCL[LightCyan]} : ${idsCL[Default]}" + echo -en "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Default]}" scip=$(/usr/bin/dig +short sc1.scity.us @10.10.10.5 -p 5053) # mmip=$(/usr/bin/dig +short myip.opendns.com @resolver1.opendns.com)