wip

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

utils/fn_server/broadcast.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+function broadcast() {
+  echo "$1 : $2"
+}

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]\""
+}

utils/server

@@ -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

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
+}