diff --git a/defaults.inc b/defaults.inc index dc8c8518..207e894c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -48,4 +48,9 @@ DISP_HEADER(){ echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" fi echo "" +} + +DIVIDER(){ + echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" + echo "" } \ No newline at end of file diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index dc7c47c9..a47968e7 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -20,7 +20,6 @@ source /opt/idssys/nodemgmt/defaults.inc STATUS() { if [ ! -z ${LOCAL_SERVICES+x} ]; then lip=$(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) - echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" echo -e "Node hostname: ${idsST[Bold]}${idsCL[LightCyan]}${NODE_HOSTNAME} (${lip})${idsST[Reset]}${idsCL[LightCyan]} - localhost${idsCL[Default]}" for srvc in "${LOCAL_SERVICES[@]}" do @@ -40,7 +39,7 @@ STATUS() { else NCMD="ssh root@${nip}"; LH='' fi - echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" + DIVIDER() echo -e "Node hostname: ${idsST[Bold]}${idsCL[LightCyan]}iDS-Node${nid} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${LH}${idsCL[Default]}" for srvc in "${NODE_SERVICES[@]}" do @@ -54,7 +53,7 @@ STATUS() { nid=`expr $nid + 1` done - echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" + DIVIDER() echo "" if [ -z $action ] && "${action}" = "gui" ]; then read -n 1 -s -p "Press any key to continue" @@ -463,9 +462,9 @@ if [ ${action-x} ]; then delsite) DELSITE ${2};; newsite) NEWSITE ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14};; update) ;; - status) STATUS ${2};; + status) DIVIDER; STATUS ${2};; status-check) STATUS-CHECK ${2};; - set-permissions) SET-PERMISSIONS ${2};; + set-permissions) DIVIDER; SET-PERMISSIONS ${2};; service) SERVICE ${2} ${3};; gui) GUI;; *)