fix: improve service_control.sh

docker/service_control.sh

@@ -11,8 +11,7 @@ MY_NAME="${0##*/}"
 PARSED_ARGUMENTS="$(getopt -n "$MY_NAME" -o t:p:a --long type:,property:,all,value,no-legend,plain -- "$@")" || exit $?
 
 eval set -- "$PARSED_ARGUMENTS"
-while :
-do
+while true; do
   case "$1" in
   -t | --type)
     shift 2
@@ -34,7 +33,7 @@ do
     shift
     ;;
   --)
-      shift;
+    shift
     break
     ;;
   *)
@@ -50,19 +49,19 @@ UNITS=($@)
 
 case "$COMMAND" in
 show)
-    for UNIT in "${UNITS[@]}"
-    do
-      for PROPERTY in "${PROPERTIES[@]}"
-      do
+  for UNIT in "${UNITS[@]}"; do
+    UNIT_STATE=$(sudo /usr/bin/supervisorctl status "$UNIT" | awk '{print tolower($2)}')
+
+    for PROPERTY in "${PROPERTIES[@]}"; do
       case "$PROPERTY" in
       LoadState)
         echo "loaded"
         ;;
       ActiveState)
-            echo "active"
+        [ "$UNIT_STATE" = "running" ] && echo "active" || echo "inactive"
         ;;
       SubState)
-            sudo /usr/bin/supervisorctl status "$UNIT" | awk '{print tolower($2)}'
+        [ "$UNIT_STATE" = "running" ] && echo "running" || echo "dead"
         ;;
       *)
         echo "unknown"
@@ -74,12 +73,11 @@ case "$COMMAND" in
   ;;
 
 list-units)
-    sudo /usr/bin/supervisorctl status | awk '{print $1".service\tloaded\tactive\t"tolower($2)"\t"$1" service"}'
+  sudo /usr/bin/supervisorctl status | awk '{print $1".service\tloaded\t"(tolower($2)=="running"?"active\trunning":"inactive\tdead")"\t"$1" service"}'
   ;;
 
 start | stop | restart)
-    for UNIT in "${UNITS[@]}"
-    do
+  for UNIT in "${UNITS[@]}"; do
     if [ "$UNIT" = "klipper" ]; then
       sudo /usr/bin/supervisorctl "$COMMAND" simulavr klipper
     else