From 69cec6bf2cc6b2f311c927118e8daaf2cbb94fba Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Thu, 17 Feb 2022 21:54:38 +0100
Subject: [PATCH] refactor: simplify service_control script

---
 docker/service_control.sh | 183 ++++++++++++++++----------------------
 1 file changed, 76 insertions(+), 107 deletions(-)

diff --git a/docker/service_control.sh b/docker/service_control.sh
index f7ce190..2023567 100644
--- a/docker/service_control.sh
+++ b/docker/service_control.sh
@@ -1,126 +1,95 @@
 #!/bin/bash
-validate_arguments ()
+
+die ()
 {
-  if [ "$1" != "0" ]; then
-    exit 1
-  fi
+  echo "$MY_NAME: $1"
+  exit 1
 }
 
-parse_show ()
-{
-  PARSED_ARGUMENTS=$(getopt -a -n systemctl -o p: --long properties:,values -- "$@")
+MY_NAME="${0##*/}"
 
-  validate_arguments $?
+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
-    case "$1" in
-      -p | --properties)
-        IFS="," read -a PROPERTIES <<< $2
-        shift 2
-        ;;
-      --values)
-        shift
-        ;;
-      --)
-        shift;
-        UNITS=($@)
-        break
-        ;;
-      *)
-        echo "systemctl: unexpected option: $1 - this should not happen."
-        exit 2
-        ;;
-    esac
-  done
-
-  for UNIT in "${UNITS[@]}"
-  do
-    for PROPERTY in "${PROPERTIES[@]}"
-    do
-      case "$PROPERTY" in
-        LoadState)
-          echo "loaded"
-          ;;
-        ActiveState)
-          echo "active"
-          ;;
-        SubState)
-          sudo /usr/bin/supervisorctl status "$UNIT" | awk '{print tolower($2)}'
-          ;;
-        *)
-          echo "unknown"
-          ;;
-      esac
-    done
-    echo ""
-  done
-
-  exit 0
-}
-
-parse_list_units ()
-{
-  PARSED_ARGUMENTS=$(getopt -a -n systemctl -o at --long all,type:,plain,no-legend -- "$@")
-
-  validate_arguments $?
-
-  eval set -- "$PARSED_ARGUMENTS"
-  while :
-  do
-    case "$1" in
-      -a | --all)
-        shift
-        ;;
-      -t | --type)
-        shift 2
-        ;;
-      --plain)
-        shift
-        ;;
-      --no-legend)
-        shift
-        ;;
-      --)
-        shift;
-        break
-        ;;
-      *)
-        echo "systemctl: unexpected option: $1 - this should not happen."
-        exit 2
-        ;;
-    esac
-  done
-
-  sudo /usr/bin/supervisorctl status | awk '{print $1".service\tloaded\tactive\t"tolower($2)"\t"$1" service"}'
-
-  exit 0
-}
+eval set -- "$PARSED_ARGUMENTS"
+while :
+do
+  case "$1" in
+    -t | --type)
+      shift 2
+      ;;
+    -p | --property)
+      IFS="," read -a PROPERTIES <<< $2
+      shift 2
+      ;;
+    -a | --all)
+      shift
+      ;;
+    --value)
+      shift
+      ;;
+    --no-legend)
+      shift
+      ;;
+    --plain)
+      shift
+      ;;
+    --)
+      shift;
+      break
+      ;;
+    *)
+      die "unexpected option: $1 - this should not happen."
+      ;;
+  esac
+done
 
 COMMAND="$1"
-
 shift
 
+UNITS=($@)
+
 case "$COMMAND" in
   show)
-    parse_show "$@"
+    for UNIT in "${UNITS[@]}"
+    do
+      for PROPERTY in "${PROPERTIES[@]}"
+      do
+        case "$PROPERTY" in
+          LoadState)
+            echo "loaded"
+            ;;
+          ActiveState)
+            echo "active"
+            ;;
+          SubState)
+            sudo /usr/bin/supervisorctl status "$UNIT" | awk '{print tolower($2)}'
+            ;;
+          *)
+            echo "unknown"
+            ;;
+        esac
+      done
+      echo ""
+    done
     ;;
-  list-units)
-    parse_list_units "$@"
-    ;;
-  start | stop | restart)
-    UNIT="$1"
 
-    if [ "$UNIT" = "klipper" ]; then
-      sudo /usr/bin/supervisorctl "$COMMAND" simulavr klipper
-    else
-      sudo /usr/bin/supervisorctl "$COMMAND" "$UNIT"
-    fi
+  list-units)
+    sudo /usr/bin/supervisorctl status | awk '{print $1".service\tloaded\tactive\t"tolower($2)"\t"$1" service"}'
     ;;
+
+  start | stop | restart)
+    for UNIT in "${UNITS[@]}"
+    do
+      if [ "$UNIT" = "klipper" ]; then
+        sudo /usr/bin/supervisorctl "$COMMAND" simulavr klipper
+      else
+        sudo /usr/bin/supervisorctl "$COMMAND" "$UNIT"
+      fi
+    done
+    ;;
+
   *)
-    echo "systemctl: unknown command '$COMMAND'"
-    exit 1
+    die "unknown command '$COMMAND'"
     ;;
 esac