From a7d82bce89f72bce9484216ff40312499cf90242 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 6 Feb 2019 09:35:25 -0600
Subject: [PATCH] update

---
 defaults.inc        |  8 +++++
 nodemgmt-scripts.sh | 79 ++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 49bcf0e7..ff7f2d2d 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -25,6 +25,14 @@ NM_SERVICES['cmon']='CC-Controller'
 NM_SERVICES['cmon-events']='CC-Events Manager'
 NM_SERVICES['cmon-cloud']='CC-Cloud Daemon'
 
+declare -A NM_SRVCOPTS
+NM_SRVCOPTS['start']='Start'
+NM_SRVCOPTS['stop']='Stopp'
+NM_SRVCOPTS['restart']='Restart'
+NM_SRVCOPTS['reload']='Reload'
+NM_SRVCOPTS['enable']='Enabl'
+NM_SRVCOPTS['disable']='Disabl'
+
 DISP_HEADER(){
 	if [ "$1" = true ]; then
 		clear
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 1d516746..94aaef05 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -575,6 +575,74 @@ SET-PERMISSIONS(){
 	fi
 }
 
+SERVICES(){
+	echo ""
+	echo -e "${idsCL[Green]}Node Services${idsCL[Default]}"
+	DIVIDER true
+	while :
+	do
+		echo ""
+		echo -e "${idsCL[Green]}Node Services${idsCL[Default]}"
+		DIVIDER true
+		s=1
+		for srvc in "${NODE_SERVICES[@]}"
+		do
+			echo " [${s}] ${NM_SERVICES[${srvc}]}"
+			s=`expr $s + 1`
+		done
+		if [ -z $action ] || [ "${action}" = "gui" ]; then
+			echo " [B] Back"
+		fi
+		echo " [Q] Quit"
+		echo ""
+		echo -e -n "${idsCL[LightYellow]}Please select a service from above:${idsCL[Default]} "
+		read selsrvc
+		echo ""
+		if [ -z ${NM_SERVICES[${selsrvc}]} ] && [ "${selsrvc}" != "Q" ] && [ "${selsrvc}" != "q" ] && [ "${selsrvc}" != "B" ] && [ "${selsrvc}" != "b" ]; then
+			echo "Thats an invaild option,"
+			echo "please select a valid option only."
+			sleep 1
+			SERVICES
+			exit 0
+		elif [ "${selsrvc}" = "Q" ] || [ "${selsrvc}" = "q" ]; then
+			exit 0
+		elif [ "${selsrvc}" = "B" ] || [ "${selsrvc}" = "b" ]; then
+			GUI
+		else
+			echo ""
+			echo -e "${idsCL[Green]}Node Service Selected: '${idsST[Bold]}${NM_SERVICES[${selsrvc}]}${idsST[Reset]}${idsCL[Green]}'${idsCL[Default]}"
+			DIVIDER true
+			s=1
+			for srvcopts in "${NM_SRVCOPTS[@]}"
+			do
+				echo " [${s}] ${srvcopts~}"
+				s=`expr $s + 1`
+			done
+			if [ -z $action ] || [ "${action}" = "gui" ]; then
+				echo " [B] Back"
+			fi
+			echo " [Q] Quit"
+			echo ""
+			echo -e -n "${idsCL[LightYellow]}Please select a service from above:${idsCL[Default]} "
+			read selsrvcopt
+			echo ""
+			if [ -z ${NM_SRVCOPTS[${selsrvcopt}]} ] && [ "${selsrvc}" != "Q" ] && [ "${selsrvc}" != "q" ] && [ "${selsrvc}" != "B" ] && [ "${selsrvc}" != "b" ]; then
+				echo "Thats an invaild option,"
+				echo "please select a valid option only."
+				sleep 1
+				SERVICES
+				exit 0
+			elif [ "${selsrvc}" = "Q" ] || [ "${selsrvc}" = "q" ]; then
+				exit 0
+			elif [ "${selsrvc}" = "B" ] || [ "${selsrvc}" = "b" ]; then
+				SERVICES
+			else
+			
+			fi
+		fi
+	done
+}
+
 SERVICE(){
 	if [ "${NM_SERVICES[${1}]}" = "" ]; then
 		echo -e "${idsCL[Red]}(${1}) is not an allowed service.${idsCL[Default]}"
@@ -584,14 +652,9 @@ SERVICE(){
 		echo -e "${idsCL[Red]}(${3}) is not an allowed service action.${idsCL[Default]}"
 		exit 1
 	fi
-	if [ "$2" = "stop" ]; then ADISP='Stopp'
-		elif [ "$2" = "enable" ]; then ADISP='Enabl'
-		elif [ "$2" = "disable" ]; then ADISP='Disabl'
-		else ADISP=${2~}
-	fi
 	if [ "$2" = "start" ] &&  [ "$1" = "haproxy" ]; then TACT='restart'; else TACT="${2}"; fi
 		
-	echo -e "${idsCL[LightGreen]}[[${NM_SERVICES[${1}]} ${ADISP}ing]]${idsCL[Default]}"
+	echo -e "${idsCL[LightGreen]}[[${NM_SERVICES[${1}]} ${NM_SRVCOPTS[${2}]}ing]]${idsCL[Default]}"
 	echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}"
 	
 	nid=1
@@ -603,7 +666,7 @@ SERVICE(){
 		else
 			NCMD="ssh root@${nip}"
 		fi
-		echo -en "${ADISP}ing on iDS-Node${nid} ($nip)... ${idsCL[Default]}"
+		echo -en "${NM_SRVCOPTS[${2}]}ing on iDS-Node${nid} ($nip)... ${idsCL[Default]}"
 		$NCMD systemctl $2 $1
 		if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; then
 			echo -e "${idsCL[Green]}OK${idsCL[Default]}"
@@ -616,7 +679,7 @@ SERVICE(){
 	done
 	
 	echo ""
-	echo -e "${idsCL[Green]}${NM_SERVICES[${1}]} has been ${ADISP}ed${idsCL[Default]}"
+	echo -e "${idsCL[Green]}${NM_SERVICES[${1}]} has been ${NM_SRVCOPTS[${2}]}ed${idsCL[Default]}"
 	echo ""
 }