From 2d029e6b931d801f96cfafb7da25b7c4ce2fa1a6 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 27 Jan 2019 22:31:51 -0600 Subject: [PATCH] update --- nodemgmt-scripts.sh | 8 -------- run.sh | 9 ++++++++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 7f1d82a3..499f6f66 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -17,13 +17,6 @@ unset IFS # ========================================================= # -echo "" -echo -e "${idsCL[LightGreen]} NodeMgmt - Galera/NGINX Node Management${idsCL[Default]} ${idsCL[DarkGray]}(ver-${VERS})${idsCL[Default]}" -echo -e "${idsCL[LightGreen]}-------------------------------------------------------------${idsCL[Default]}" -echo -e "Node hostname: ${node_hostname}" -echo -e "${idsCL[LightGreen]}-------------------------------------------------------------${idsCL[Default]}" -echo "" - case "$1" in service) if [ "$2" = "nginx" ]; then SER='NGINX' @@ -31,7 +24,6 @@ case "$1" in elif [ "$2" = "gogs" ]; then SER='Gogs' fi - echo "" STA="$(tr '[:lower:]' '[:upper:]' <<< ${3:0:1})${3:1}" echo -e "${idsCL[LightGreen]}[[${SER} ${STA}ing]]${idsCL[Default]}" echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}" diff --git a/run.sh b/run.sh index 60d39570..700a6a13 100755 --- a/run.sh +++ b/run.sh @@ -2,7 +2,14 @@ # NodeMgmt Loader source /opt/idssys/nodemgmt/settings.conf -#echo "" + +echo "" +echo -e "${idsCL[Yellow} NodeMgmt - Galera/NGINX Node Management${idsCL[Default]} ${idsCL[DarkGray]}(ver-${VERS})${idsCL[Default]}" +echo -e "${idsCL[Yellow}-------------------------------------------------------------${idsCL[Default]}" +echo -e "Node hostname: ${node_hostname}" +echo -e "${idsCL[Yellow}-------------------------------------------------------------${idsCL[Default]}" +echo "" + if [ "$1" != "service1111" ]; then cd /opt/idssys/defaults if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then