Source Update

src/commands/help.sh

@@ -1,4 +1,4 @@
-wx-help() {
+wx-help(){
 echo -n "$wxItalic"
 echo "          >> Help <<          "
 echo -n "$wxNormal";

src/commands/init.sh

@@ -1,4 +1,4 @@
-wx-init () {
+wx-init(){
     wx-login
 
     echo -n "$wxItalic"

src/commands/settings.sh

@@ -1,4 +1,4 @@
-wx-settings() {
+wx-settings(){
     wx-login
 
     echo -n "$wxItalic"

src/commands/ssh.sh

@@ -1,4 +1,4 @@
-wx-ssh() {
+wx-ssh(){
     wx-login
 
     case $1 in

src/commands/ssh/sign.sh

@@ -5,32 +5,30 @@ wx-ssh-sign(){
     echo -n "$wxNormal"
     echo "------------------------------"
 
-    NAME=warengroup
-    ROLE=sysadmin
-    PRINCIPALS=sysadmin
-    TTL=3600
-
-    if [[ -f "$HOME/.ssh/keys/$NAME-ed25519" ]]
+    if [[ $ORG == "warengroup" ]]
     then
-        echo "$NAME/$ROLE"
-        echo $(curl https://$VAULT_DOMAIN/v1/ssh/sign/$ROLE -X POST --header "X-Vault-Token: ${config[$ORG]}" -d "{ \"public_key\": \"$(cat $HOME/.ssh/keys/$NAME-ed25519.pub)\", \"valid_principals\": \"$PRINCIPALS,$USER\", \"ttl\": \"$TTL\" }" -s | jq -r '.data.signed_key') > ~/.ssh/keys/$NAME-ed25519.sig 2>&1
-    fi
-
-    NAME=cwinfo
-    ROLE=sysadmin
-    PRINCIPALS=sysadmin
-    TTL=3600
-
-    if [[ -f "$HOME/.ssh/keys/$NAME-ed25519" ]]
+        wx-ssh-sign-create warengroup sysadmin 3600
+    elif [[ $ORG == "cwinfo" ]]
     then
-        echo "$NAME/$ROLE"
-        echo $(curl https://$VAULT_DOMAIN/v1/ssh/sign/$ROLE -X POST --header "X-Vault-Token: ${config[$ORG]}" -d "{ \"public_key\": \"$(cat $HOME/.ssh/keys/$NAME-ed25519.pub)\", \"valid_principals\": \"$PRINCIPALS,$USER\", \"ttl\": \"$TTL\" }" -s | jq -r '.data.signed_key') > ~/.ssh/keys/$NAME-ed25519.sig 2>&1
+        wx-ssh-sign-create cwinfo sysadmin 3600
+    elif [[ $ORG == "cwchristerw" ]]
+    then
+        wx-ssh-sign-create warengroup sysadmin 3600
+        wx-ssh-sign-create cwinfo sysadmin 3600
+        wx-ssh-sign-create cwchristew sysadmin 3600
     fi
+}
 
-    NAME=cwchristerw
-    ROLE=sysadmin
-    PRINCIPALS=sysadmin
-    TTL=3600
+wx-ssh-sign-create(){
+    NAME=$1
+    ROLE=$2
+    PRINCIPALS=$2
+    TTL=$3
+
+    if [[ ! -f "$HOME/.ssh/keys/$NAME-ed25519" ]]
+    then
+        ssh-keygen -t ed25519 -f $HOME/.ssh/keys/$NAME-ed25519 -q -N "" &> /dev/null
+    fi
 
     if [[ -f "$HOME/.ssh/keys/$NAME-ed25519" ]]
     then

src/commands/welcome.sh

@@ -1,4 +1,4 @@
-wx-welcome() {
+wx-welcome(){
     echo -n "$wxItalic"
     echo "         >> Welcome <<        "
     echo -n "$wxNormal"

src/functions/login.sh

@@ -1,4 +1,4 @@
-wx-login() {
+wx-login(){
     echo -n "$wxItalic"
     echo "          >> Login <<         "
     echo -n "$wxNormal";

src/functions/start.sh

@@ -1,4 +1,4 @@
-wx-start() {
+wx-start(){
     echo ""
     echo ""
     echo ""

src/functions/stop.sh

@@ -1,4 +1,4 @@
-wx-stop () {
+wx-stop (){
     echo " "
     echo " "
     echo " "