Refactoring Code

src/commands/maintenance/install.sh

@@ -1,29 +1,25 @@
 wx-install(){
-    if [[ -z $1 ]]
-    then
-        wx-header "Install"
-    fi
+  wxi-header "Install"
+  wxi-restricted --user
 
-    wx-restricted
+  if [[ -f "./wx" && -f "./maintainer.sh" && -d "./src" ]]
+  then
+    ./maintainer.sh
+  fi
 
-    if [[ -f "./wx" ]] && [[ -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
-    fi
+  mkdir -p $HOME/bin
+  if [[ $(curl -s -o /dev/null -w "%{http_code}"  https://git.waren.io/warengroup/wx/raw/branch/master/wx) -eq 200 ]]
+  then
+    curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o $HOME/bin/wx &> /dev/null
+    chmod +x $HOME/bin/wx &> /dev/null
+  fi
 
-    mkdir $HOME/bin &> /dev/null
-    if [[ $(curl -s -o /dev/null -w "%{http_code}"  https://git.waren.io/warengroup/wx/raw/branch/master/wx) -eq 200 ]]
-    then
-        curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o $HOME/bin/wx &> /dev/null
-        chmod +x $HOME/bin/wx &> /dev/null
-    fi
+  CRONJOB_NAME="#Warén CLI: Auto"
+  CRONJOB_TASK="*/5 * * * * $HOME/bin/wx auto"
+  if [[ -z $(crontab -l | grep -F "$CRONJOB_NAME") || -z $(crontab -l | grep -F "$CRONJOB_TASK") ]]
+  then
+    (crontab -l ; echo "$CRONJOB_NAME" ; echo "$CRONJOB_TASK") | grep -Fv "no crontab" | crontab -
+  fi
 
-    CRONJOB_NAME="#Warén CLI: Auto"
-    CRONJOB_TASK="*/5 * * * * $HOME/bin/wx auto"
-    if [[ -z $(crontab -l | grep -F "$CRONJOB_NAME") || -z $(crontab -l | grep -F "$CRONJOB_TASK") ]]
-    then
-        (crontab -l ; echo "$CRONJOB_NAME" ; echo "$CRONJOB_TASK") | grep -Fv "no crontab" | crontab -
-    fi
+  wxi-footer
 }

src/commands/maintenance/uninstall.sh

@@ -1,28 +1,26 @@
 wx-uninstall(){
-    wx-header "Uninstall"
+  wxi-header "Uninstall"
+  wxi-restricted --user
+  wx-clean &> /dev/null
 
-    wx-clean &> /dev/null
+  if [[ -d "$HOME/.warengroup" ]]
+  then
+    rm "$HOME/.warengroup" -rf
+  fi
 
-    if [[ -d "$HOME/.warengroup" ]]
-    then
-        rm "$HOME/.warengroup" -rf
-    fi
+  CRONJOB_NAME="#Warén CLI: Auto"
+  CRONJOB_TASK="*/5 * * * * $HOME/bin/wx auto"
+  if [[ $(crontab -l | grep -F "$CRONJOB_NAME") || $(crontab -l | grep -F "$CRONJOB_TASK") ]]
+  then
+    crontab -l | grep -Fv "$CRONJOB_NAME" | grep -Fv "$CRONJOB_TASK" | grep -Fv "no crontab" | crontab -
+  fi
 
-    CRONJOB_NAME="#Warén CLI: Auto"
-    CRONJOB_TASK="*/5 * * * * $HOME/bin/wx auto"
-    if [[ $(crontab -l | grep -F "$CRONJOB_NAME") || $(crontab -l | grep -F "$CRONJOB_TASK") ]]
-    then
-        crontab -l | grep -Fv "$CRONJOB_NAME" | grep -Fv "$CRONJOB_TASK" | grep -Fv "no crontab" | crontab -
-    fi
+  if [[ -f "$HOME/bin/wx" ]]
+  then
+    rm "$HOME/bin/wx" -rf
+  fi
 
-    if [[ -f "$HOME/bin/wx" ]]
-    then
-        rm "$HOME/bin/wx" -rf
-    fi
-
-    echo " "
-    echo " "
-    echo " "
-
-    exit 1
+  wxi-footer
+  wxi-repeat "\n" 3
+  exit 1
 }

src/commands/maintenance/update.sh

@@ -1,4 +1,9 @@
 wx-update(){
-    wx-header "Update"
-    wx-install --update
+  wxi-header "Update"
+  wxi-restricted --user
+
+  wx-install &> /dev/null
+  echo "Updates Completed"
+
+  wxi-footer
 }