From c04a1341de2b73421a5b5fab04c25c2eb34039c3 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 3 Feb 2019 19:41:27 -0600
Subject: [PATCH] Update run.sh

---
 run.sh | 88 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

diff --git a/run.sh b/run.sh
index b7565d15..82743097 100755
--- a/run.sh
+++ b/run.sh
@@ -10,53 +10,51 @@ else
 fi
 source /opt/idssys/nodemgmt/defaults.inc
 
-if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ]; then 
-	if [ "$1" != "status" ]; then
-		if [ -z $1 ]; then
-			clear
-		fi
-		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:		${idsST[Bold]}${idsCL[LightCyan]}${NODE_HOSTNAME}${idsCL[Default]}${idsST[Reset]}"
-		if [ -z ${LOCAL_SERVICES+x} ]; then SERVICES=$( IFS=$','; echo "${NODE_SERVICES[*]}" )
-			else SERVICES=$( IFS=$','; echo "${LOCAL_SERVICES[*]}" )
-		fi
-		IFS=,; SERVICES2=(${SERVICES}); unset IFS
-		for srvc in "${SERVICES2[@]}"
-		do
-			if [[ "mysql,nginx,gitea,haproxy,keepalived,maxscale" = *"${srvc}"* ]]; then spc="	"; else spc=""; fi
-			echo -en "${NM_SERVICES[${srvc}]}   	$spc"
-			if [ $(pgrep ${srvc} | wc -l) -gt "0" ]; then
-				echo -e "${idsCL[Green]}Running${idsCL[Default]}"
-				else echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
-			fi
-		done
-		echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
-		echo ""
+if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ]; then
+	if [ -z $1 ]; then
+		clear
 	fi
-		echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
-		echo ""
-		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 
-			git fetch origin master >/dev/null 2>&1
-			git reset --hard origin/master >/dev/null 2>&1
-			git reflog expire --expire=now --all >/dev/null 2>&1
-			git repack -ad >/dev/null 2>&1
-			git prune >/dev/null 2>&1
-			git pull >/dev/null 2>&1
+	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:		${idsST[Bold]}${idsCL[LightCyan]}${NODE_HOSTNAME}${idsCL[Default]}${idsST[Reset]}"
+	if [ -z ${LOCAL_SERVICES+x} ]; then SERVICES=$( IFS=$','; echo "${NODE_SERVICES[*]}" )
+		else SERVICES=$( IFS=$','; echo "${LOCAL_SERVICES[*]}" )
+	fi
+	IFS=,; SERVICES2=(${SERVICES}); unset IFS
+	for srvc in "${SERVICES2[@]}"
+	do
+		if [[ "mysql,nginx,gitea,haproxy,keepalived,maxscale" = *"${srvc}"* ]]; then spc="	"; else spc=""; fi
+		echo -en "${NM_SERVICES[${srvc}]}   	$spc"
+		if [ $(pgrep ${srvc} | wc -l) -gt "0" ]; then
+			echo -e "${idsCL[Green]}Running${idsCL[Default]}"
+			else echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
 		fi
-		cd /opt/idssys/nodemgmt
-		if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then 
-			git fetch origin master >/dev/null 2>&1
-			git reset --hard origin/master >/dev/null 2>&1
-			git reflog expire --expire=now --all >/dev/null 2>&1
-			git repack -ad >/dev/null 2>&1
-			git prune >/dev/null 2>&1
-			git pull >/dev/null 2>&1
-		fi
-		echo -en "\e[1A";
-		echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
+	done
+	echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
+	echo ""
+	echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
+	echo ""
+	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 
+		git fetch origin master >/dev/null 2>&1
+		git reset --hard origin/master >/dev/null 2>&1
+		git reflog expire --expire=now --all >/dev/null 2>&1
+		git repack -ad >/dev/null 2>&1
+		git prune >/dev/null 2>&1
+		git pull >/dev/null 2>&1
+	fi
+	cd /opt/idssys/nodemgmt
+	if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then 
+		git fetch origin master >/dev/null 2>&1
+		git reset --hard origin/master >/dev/null 2>&1
+		git reflog expire --expire=now --all >/dev/null 2>&1
+		git repack -ad >/dev/null 2>&1
+		git prune >/dev/null 2>&1
+		git pull >/dev/null 2>&1
+	fi
+	echo -en "\e[1A";
+	echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
 fi
 echo ""
 /opt/idssys/nodemgmt/nodemgmt-scripts.sh ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}