Source Update

src/base.sh

@@ -5,50 +5,49 @@ if [ ! "$BASH_VERSION" ] ; then
     exit 1
 fi
 
-warencli-syntax-line-douple() {
+syntax-line-douple() {
 echo -n "
 ==============================
 "
 }
 
-warencli-syntax-line-single() {
+syntax-line-single() {
 echo -n "
 ------------------------------
 "
 }
 
-warencli-start() {
+start() {
-warencli-syntax-line-douple
+syntax-line-douple
 echo -n "Warén CLI "
-warencli-syntax-line-douple
+syntax-line-douple
+if [[ -d "./src" ]]
+then
+  podman run -it --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp docker.io/library/php:8-cli php generator.php &> /dev/null
+  mv wx.tmp wx &> /dev/null
+  chmod +x wx &> /dev/null
+else
+  sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null
+  if [[ -d "/usr/bin" ]]
+  then
+    sudo ln -sf /opt/wx /usr/bin/wx &> /dev/null
+  fi
+  sudo chmod +x /usr/bin/wx &> /dev/null
+fi
+
 }
 
-warencli-stop () {
+stop () {
   echo " "
   echo " "
   exit 1
 }
 
-warencli-update() {
-if [[ -d "./src" ]]; then
-  echo ">>> Building... <<<"
-  podman run -it --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp docker.io/library/php:8-cli php generator.php &> /dev/null
-  mv wx.tmp wx
-  chmod +x wx
-else
-  echo ">>> Updating... <<<"
-  sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null
-  if [[ -d "/usr/bin" ]]; then
-    sudo ln -sf /opt/wx /usr/bin/wx &> /dev/null
-  fi
-  sudo chmod +x /usr/bin/wx &> /dev/null
-fi
-}
-
 COMMAND=$1
 
-warencli-start
+start
-if [[ ! -z $1 ]]; then
+if [[ ! -z $1 ]] && [[ $(type -t warencli-$1) == function ]]
+then
     warencli-$1 $2 $3 $4 $5 $6 $7 $8 $9
 fi
-warencli-stop
+stop

src/commands/help.sh

@@ -13,10 +13,5 @@ Authentication Commands:
 
 Management Commands:
   settings   Settings
-
-Maintenance Commands:
-  install    Install
-  update     Update
 ";
 }
-

src/commands/install.sh

@@ -1,3 +0,0 @@
-warencli-install() {
-echo ">>> Install";
-}

wx

@@ -5,50 +5,49 @@ if [ ! "$BASH_VERSION" ] ; then
     exit 1
 fi
 
-warencli-syntax-line-douple() {
+syntax-line-douple() {
 echo -n "
 ==============================
 "
 }
 
-warencli-syntax-line-single() {
+syntax-line-single() {
 echo -n "
 ------------------------------
 "
 }
 
-warencli-start() {
+start() {
-warencli-syntax-line-douple
+syntax-line-douple
 echo -n "Warén CLI "
-warencli-syntax-line-douple
+syntax-line-douple
+if [[ -d "./src" ]]
+then
+  podman run -it --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp docker.io/library/php:8-cli php generator.php &> /dev/null
+  mv wx.tmp wx &> /dev/null
+  chmod +x wx &> /dev/null
+else
+  sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null
+  if [[ -d "/usr/bin" ]]
+  then
+    sudo ln -sf /opt/wx /usr/bin/wx &> /dev/null
+  fi
+  sudo chmod +x /usr/bin/wx &> /dev/null
+fi
+
 }
 
-warencli-stop () {
+stop () {
   echo " "
   echo " "
   exit 1
 }
 
-warencli-update() {
-if [[ -d "./src" ]]; then
-  echo ">>> Building... <<<"
-  podman run -it --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp docker.io/library/php:8-cli php generator.php &> /dev/null
-  mv wx.tmp wx
-  chmod +x wx
-else
-  echo ">>> Updating... <<<"
-  sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null
-  if [[ -d "/usr/bin" ]]; then
-    sudo ln -sf /opt/wx /usr/bin/wx &> /dev/null
-  fi
-  sudo chmod +x /usr/bin/wx &> /dev/null
-fi
-}
-
 COMMAND=$1
 
-warencli-start
+start
-if [[ ! -z $1 ]]; then
+if [[ ! -z $1 ]] && [[ $(type -t warencli-$1) == function ]]
+then
     warencli-$1 $2 $3 $4 $5 $6 $7 $8 $9
 fi
-warencli-stop
+stop