fix: improve service_control.sh

docker/service_control.sh

@@ -11,14 +11,13 @@ 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 :
+while true; do
-do
   case "$1" in
   -t | --type)
     shift 2
     ;;
   -p | --property)
-      IFS="," read -a PROPERTIES <<< $2
+    IFS="," read -a PROPERTIES <<<$2
     shift 2
     ;;
   -a | --all)
@@ -34,7 +33,7 @@ do
     shift
     ;;
   --)
-      shift;
+    shift
     break
     ;;
   *)
@@ -49,20 +48,20 @@ shift
 UNITS=($@)
 
 case "$COMMAND" in
-  show)
+show)
-    for UNIT in "${UNITS[@]}"
+  for UNIT in "${UNITS[@]}"; do
-    do
+    UNIT_STATE=$(sudo /usr/bin/supervisorctl status "$UNIT" | awk '{print tolower($2)}')
-      for PROPERTY in "${PROPERTIES[@]}"
+
-      do
+    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"
@@ -73,13 +72,12 @@ case "$COMMAND" in
   done
   ;;
 
-  list-units)
+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)
+start | stop | restart)
-    for UNIT in "${UNITS[@]}"
+  for UNIT in "${UNITS[@]}"; do
-    do
     if [ "$UNIT" = "klipper" ]; then
       sudo /usr/bin/supervisorctl "$COMMAND" simulavr klipper
     else
@@ -88,7 +86,7 @@ case "$COMMAND" in
   done
   ;;
 
-  *)
+*)
   die "unknown command '$COMMAND'"
   ;;
 esac