From 0e57ea4d88afc3a15acacf9a5f2589cc6cbe7935 Mon Sep 17 00:00:00 2001
From: LinuxSquare <linuxscripting.sh@gmail.com>
Date: Sun, 21 Apr 2024 14:46:19 +0200
Subject: [PATCH] wip

---
 pms-cli                                 |  7 +++----
 utils/{attach => attach.sh}             |  0
 utils/{configparser => configparser.sh} |  0
 utils/{datapack => datapack.sh}         |  0
 utils/{delete => delete.sh}             |  0
 utils/fn_server/broadcast.sh            |  5 +++++
 utils/fn_server/help.sh                 |  7 +++++++
 utils/{init => init.sh}                 |  0
 utils/{logging => logging.sh}           |  0
 utils/{podman => podman.sh}             |  0
 utils/{reset => reset.sh}               |  0
 utils/server                            | 28 -------------------------
 utils/server.sh                         | 24 +++++++++++++++++++++
 utils/{start => start.sh}               |  0
 utils/{stop => stop.sh}                 |  0
 15 files changed, 39 insertions(+), 32 deletions(-)
 rename utils/{attach => attach.sh} (100%)
 rename utils/{configparser => configparser.sh} (100%)
 rename utils/{datapack => datapack.sh} (100%)
 rename utils/{delete => delete.sh} (100%)
 create mode 100644 utils/fn_server/broadcast.sh
 create mode 100644 utils/fn_server/help.sh
 rename utils/{init => init.sh} (100%)
 rename utils/{logging => logging.sh} (100%)
 rename utils/{podman => podman.sh} (100%)
 rename utils/{reset => reset.sh} (100%)
 delete mode 100644 utils/server
 create mode 100644 utils/server.sh
 rename utils/{start => start.sh} (100%)
 rename utils/{stop => stop.sh} (100%)

diff --git a/pms-cli b/pms-cli
index f28c651..a22af0a 100755
--- a/pms-cli
+++ b/pms-cli
@@ -8,7 +8,7 @@ readonly TEMPLATEDIR="${ROOTPATH}/.template"
 readonly BUILDDIR="$(mktemp -d /tmp/pms-cli.XXXXXX)"
 readonly CONFIG="/usr/local/noveria/etc/pms-cli/pms-cli.json"
 
-for util in ${ROOTPATH}/utils/*; do
+for util in ${ROOTPATH}/utils/*.sh; do
   source ${util}
 done
 
@@ -104,9 +104,8 @@ while true; do
         delete "${1}"
       ;;
     --server)
-        shift; shift
-        bash ${ROOTPATH}/utils/server "${1}" "${3}" "${4}"
-        exit $?
+        shift
+        server "${1}" "${3}" "${4}"
       ;;
     --)
         shift
diff --git a/utils/attach b/utils/attach.sh
similarity index 100%
rename from utils/attach
rename to utils/attach.sh
diff --git a/utils/configparser b/utils/configparser.sh
similarity index 100%
rename from utils/configparser
rename to utils/configparser.sh
diff --git a/utils/datapack b/utils/datapack.sh
similarity index 100%
rename from utils/datapack
rename to utils/datapack.sh
diff --git a/utils/delete b/utils/delete.sh
similarity index 100%
rename from utils/delete
rename to utils/delete.sh
diff --git a/utils/fn_server/broadcast.sh b/utils/fn_server/broadcast.sh
new file mode 100644
index 0000000..0ed3fcb
--- /dev/null
+++ b/utils/fn_server/broadcast.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+function broadcast() {
+  echo "$1 : $2"
+}
diff --git a/utils/fn_server/help.sh b/utils/fn_server/help.sh
new file mode 100644
index 0000000..4d8988e
--- /dev/null
+++ b/utils/fn_server/help.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+function help() {
+  echo -e "usage: pms-cli --server $1 <operation>
+operations:
+    pms-cli --server $1 broadcast \"[message]\""
+}
diff --git a/utils/init b/utils/init.sh
similarity index 100%
rename from utils/init
rename to utils/init.sh
diff --git a/utils/logging b/utils/logging.sh
similarity index 100%
rename from utils/logging
rename to utils/logging.sh
diff --git a/utils/podman b/utils/podman.sh
similarity index 100%
rename from utils/podman
rename to utils/podman.sh
diff --git a/utils/reset b/utils/reset.sh
similarity index 100%
rename from utils/reset
rename to utils/reset.sh
diff --git a/utils/server b/utils/server
deleted file mode 100644
index 559b1e2..0000000
--- a/utils/server
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-readonly server="$1"
-
-function server_help() {
-  echo -e "usage: pms-cli --server $server <operation>
-operations:
-    pms-cli --server $server broadcast \"[message]\""
-}
-
-function broadcast() {
-  echo "$server : $1"
-}
-
-if [[ "$2" != "" ]]; then
-  case "${2}" in
-    "help")
-      server_help
-    ;;
-    "broadcast")
-      shift
-      broadcast "$2"
-    ;;
-    *)
-      server_help
-      exit 1
-  esac
-fi
diff --git a/utils/server.sh b/utils/server.sh
new file mode 100644
index 0000000..8fb33a4
--- /dev/null
+++ b/utils/server.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+function server() {
+  for fn_server in ${ROOTPATH}/utils/fn_server/*.sh; do
+    source ${fn_server}
+  done
+
+  local server="$1"
+
+  if [[ "$2" != "" ]]; then
+  case "${2}" in
+    "help")
+      help
+    ;;
+    "broadcast")
+      shift
+      broadcast "$server" "$2"
+    ;;
+    *)
+      help
+      exit 1
+  esac
+fi
+}
diff --git a/utils/start b/utils/start.sh
similarity index 100%
rename from utils/start
rename to utils/start.sh
diff --git a/utils/stop b/utils/stop.sh
similarity index 100%
rename from utils/stop
rename to utils/stop.sh