Build Update

wx

@@ -5,25 +5,14 @@ if [ ! "$BASH_VERSION" ] ; then
     exit 1
 fi
 
-syntax-line-douple() {
-echo -n "
-==============================
-"
+wx-elements-line-douple () {
+    echo "=============================="
+}
+wx-elements-line-single () {
+    echo "------------------------------"
 }
 
-syntax-line-single() {
-echo -n "
-------------------------------
-"
-}
-
-start() {
-    syntax-line-douple
-    echo -n "Warén CLI "
-    syntax-line-douple
-}
-
-login() {
+wx-login() {
     echo ">>> Login <<<"
     ORG=$2
 
@@ -43,7 +32,7 @@ login() {
     elif [[ -z $ORG ]]
     then
         echo "Organization: Required"
-        exit 1
+        stop
     fi
 
     if [[ $ORG == "warengroup" ]]
@@ -57,7 +46,7 @@ login() {
         DOMAIN=christerwaren.fi
     else
         echo "Organization: Unsupported"
-        exit 1
+        stop
     fi
 
     FOLDER=$ORG
@@ -74,7 +63,7 @@ login() {
         HOSTNAME="$2.$DEVICE_DOMAIN"
     else
         echo "Hostname: Required"
-        exit 1
+        stop
     fi
 
     if [[ -z $USER ]]
@@ -84,7 +73,7 @@ login() {
             if [[ -z LOGNAME ]]
             then
                 echo "Username: Required"
-                exit 1
+                stop
             else
                 USER=$LOGNAME
             fi
@@ -111,21 +100,22 @@ login() {
 
             echo -n "Password: "
             read -s PASSWORD
-            echo -n "****************"
+            echo "****************"
             VAULT_LOGIN=$(curl https://$VAULT_DOMAIN/v1/auth/ldap/login/$USERNAME -X POST -d '{ "password": "'$PASSWORD'" }' -s | jq -r '.auth.client_token')
             if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]; then
                 echo "Status: Login Failed"
-                exit 1
+                stop
             fi
+            echo ""
         else
             echo "Organization: $ORG"
             echo "Status: IDM Offline"
-            exit 1
+            stop
         fi
     else
         echo "Organization: $ORG"
         echo "Status: Vault Offline"
-        exit 1
+        stop
     fi
 
 
@@ -144,7 +134,7 @@ login() {
     #             VAULT_LOGIN=$(vault login -address=https://vault.$DOMAIN -method=ldap username=$USER 2> /dev/null)
     #             echo ""
     #             if [[ -z $VAULT_LOGIN ]]; then
-    #                 exit 1
+                    stop
     #             fi
     #         else
     #             echo "vault.$DOMAIN - Login"
@@ -153,7 +143,7 @@ login() {
     #             VAULT_LOGIN=$(vault login -address=https://vault.$DOMAIN -method=token 2> /dev/null)
     #             echo ""
     #             if [[ -z $VAULT_LOGIN || ${#VAULT_TOKEN} -lt 95 || ${#VAULT_TOKEN} -gt 95 ]]; then
-    #                 exit 1
+    #                 stop
     #             fi
     #         fi
     #     fi
@@ -164,10 +154,21 @@ login() {
     # then
     #     echo "Status: Login Failed"
     # fi
-    start
 }
 
-stop () {
+wx-start() {
+    echo ""
+    echo ""
+    echo ""
+    wx-elements-line-douple
+    echo "Warén CLI"
+    wx-elements-line-douple
+}
+
+wx-stop () {
+    echo " "
+    echo " "
+    echo " "
     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
@@ -181,12 +182,11 @@ stop () {
         fi
         sudo chmod +x /usr/bin/wx &> /dev/null
     fi
-    echo " "
-    echo " "
     exit 1
 }
 
-warencli-help() {
+wx-help() {
+echo -n ">>> Help <<<";
 echo "
 Usage: $0 COMMAND [OPTIONS]
 
@@ -200,26 +200,34 @@ Management Commands:
 ";
 }
 
-warencli-settings() {
-    echo ">>> Settings <<<";
+wx-settings() {
+    echo -n ">>> Settings <<<";
 }
 
-warencli-ssh() {
-    echo ">>> SSH <<<";
+wx-ssh() {
+    echo -n ">>> SSH <<<";
 }
 
-warencli-ssh-config(){
-    echo ">>> SSH: Config <<<"
+wx-welcome() {
+    echo -n ">>> Welcome <<<"
 }
 
-warencli-ssh-sign(){
-    echo ">>> SSH: Certificates <<<"
+wx-ssh-config(){
+    echo -n ">>> SSH: Config <<<"
+}
+
+wx-ssh-sign(){
+    echo -n ">>> SSH: Certificates <<<"
 }
 
 
-start
-if [[ ! -z $1 ]] && [[ $(type -t warencli-$1) == function ]]
+wx-start
+if [[ ! -z $1 ]] && [[ $(type -t wx-$1) == function ]]
 then
-    warencli-$1 $2 $3 $4 $5 $6 $7 $8 $9
+    wx-login
+    wx-start
+    wx-$1 $2 $3 $4 $5 $6 $7 $8 $9
+else
+    wx-welcome
 fi
-stop
+wx-stop