svc

чување face50b59692ed45847fa79d2afbd56b97ae6e28
родитељ e5a04cbf63928c8d9e9807fe0808c0ce65939f15
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu, 27 Apr 2023 19:45:43 +0200

bin/service: Adjust output if service name >8 (and >16) chars

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
bin/service
 | 
23
+++++++++++++++--------

измењених датотека: 1, додавања: 15(+), брисања: 8(-)
diff --git a/bin/service b/bin/service
@@ -41,13 +41,20 @@ doservice()
 	local cmd=$1 service=$2 running=0 nooutcome=0 errno stop=${stop:-0}
 	local activated=0
 
+	sname=${service##*/}
+	tabs="\t"
+	if [ ${#sname} -lt 8 ]; then
+		tabs="${tabs}\t\t"
+	elif [ ${#sname} -lt 16 ]; then
+		tabs="${tabs}\t"
+	fi
 	case "${cmd}" in
 	a*d)	activated=1
 		if [ "${service}" = "all" ] || [ -z "${service}" ]; then
 			nooutcome=1
 			svc -a 2>/dev/null
 		else
-			msg serv "Service %s activated?\t\t\t" ${service##*/}
+			msg serv "Service %s activated?${tabs}" ${sname}
 			svc -ad "${service}" 2>/dev/null
 		fi;;
 	a*)	if [ -z "${service}" ]; then
@@ -55,7 +62,7 @@ doservice()
 			msg err "No service given"
 			exit 2
 		else
-			msg serv "Activating %s\t\t\t" ${service##*/}
+			msg serv "Activating %s${tabs}" ${sname}
 			svc -a "${service}" 2>/dev/null
 		fi;;
 	d*)	if [ -z "${service}" ]; then
@@ -63,7 +70,7 @@ doservice()
 			msg err "No service given"
 			exit 2
 		else
-			msg serv "Deactivating %s\t\t\t" ${service##*/}
+			msg serv "Deactivating %s${tabs}" ${sname}
 			svc -d "${service}" 2>/dev/null
 		fi;;
 	l*)	nooutcome=1
@@ -73,7 +80,7 @@ doservice()
 			msg err "No service given"
 			exit 2
 		else
-			msg servnl "Starting %s" ${service##*/}
+			msg servnl "Starting %s" ${sname}
 			svc -s "${service}" 2>/dev/null &
 		fi;;
 	sto*)	nooutcome=1
@@ -82,7 +89,7 @@ doservice()
 			exit 2
 		else
 			stop=1
-			msg servnl "Stopping %s" ${service##*/}
+			msg servnl "Stopping %s" ${sname}
 			svc -k "${service}" 2>/dev/null &
 		fi;;
 	re*)	nooutcome=1
@@ -90,7 +97,7 @@ doservice()
 			msg err "No service given"
 			exit 2
 		else
-			msg servnl "Restarting %s" ${service##*/}
+			msg servnl "Restarting %s" ${sname}
 			svc -r "${service}" 2>/dev/null &
 		fi;;
 	ru*)	if [ -z "${service}" ]; then
@@ -98,7 +105,7 @@ doservice()
 			msg err "No service given"
 			exit 2
 		else
-			msg serv "%s running?\t\t\t" ${service##*/}
+			msg serv "%s running?${tabs}" ${sname}
 			running=1
 			svc -e "${service}" 2>/dev/null
 		fi;;
@@ -107,7 +114,7 @@ doservice()
 			msg err "No service given"
 			exit 2
 		else
-			msg err "What to do with %s?" ${service##*/}
+			msg err "What to do with %s?" ${sname}
 			exit 2
 		fi;;
 	esac