diff --git a/src/functions/login.sh b/src/functions/login.sh index 1f2d66c..62e44ff 100644 --- a/src/functions/login.sh +++ b/src/functions/login.sh @@ -6,7 +6,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Hostname Required" + echo "Status: Hostname Required" wx-stop fi @@ -26,7 +26,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Organization Required" + echo "Status: Organization Required" wx-stop fi @@ -43,7 +43,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Organization Unsupported" + echo "Status: Organization Unsupported" wx-stop fi @@ -62,7 +62,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Hostname Required" + echo "Status: Hostname Required" wx-stop fi @@ -75,7 +75,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Username Required" + echo "Status: Username Required" wx-stop else USER=$LOGNAME @@ -123,13 +123,13 @@ wx-login(){ if [[ -z $USERNAME || -z $PASSWORD ]] then - echo -n "Status: Username & Password Required" + echo "Status: Username & Password Required" wx-stop else 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 -n "Status: Login Failed" + echo "Status: Login Failed" wx-stop fi @@ -151,14 +151,14 @@ wx-login(){ if [[ -z $TOKEN || ${#TOKEN} -lt 95 || ${#TOKEN} -gt 95 ]] then - echo -n "Status: Vault Token Required" + echo "Status: Vault Token Required" wx-stop fi VAULT_LOGIN=$(curl https://$VAULT_DOMAIN/v1/auth/token/renew -X POST --header "X-Vault-Token: $TOKEN" -d '{ "token": "'$TOKEN'" }' -s | jq -r '.auth.client_token') if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]] then - echo -n "Status: Login Failed" + echo "Status: Login Failed" wx-stop fi @@ -175,7 +175,7 @@ wx-login(){ echo $wxBold$ORG$wxNormal - echo -n "Status: Vault Offline" + echo "Status: Vault Offline" wx-stop fi } diff --git a/wx b/wx index 4e7efff..06148de 100755 --- a/wx +++ b/wx @@ -27,7 +27,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Hostname Required" + echo "Status: Hostname Required" wx-stop fi @@ -47,7 +47,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Organization Required" + echo "Status: Organization Required" wx-stop fi @@ -64,7 +64,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Organization Unsupported" + echo "Status: Organization Unsupported" wx-stop fi @@ -83,7 +83,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Hostname Required" + echo "Status: Hostname Required" wx-stop fi @@ -96,7 +96,7 @@ wx-login(){ echo " >> Login << " echo "------------------------------" - echo -n "Status: Username Required" + echo "Status: Username Required" wx-stop else USER=$LOGNAME @@ -144,13 +144,13 @@ wx-login(){ if [[ -z $USERNAME || -z $PASSWORD ]] then - echo -n "Status: Username & Password Required" + echo "Status: Username & Password Required" wx-stop else 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 -n "Status: Login Failed" + echo "Status: Login Failed" wx-stop fi @@ -172,14 +172,14 @@ wx-login(){ if [[ -z $TOKEN || ${#TOKEN} -lt 95 || ${#TOKEN} -gt 95 ]] then - echo -n "Status: Vault Token Required" + echo "Status: Vault Token Required" wx-stop fi VAULT_LOGIN=$(curl https://$VAULT_DOMAIN/v1/auth/token/renew -X POST --header "X-Vault-Token: $TOKEN" -d '{ "token": "'$TOKEN'" }' -s | jq -r '.auth.client_token') if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]] then - echo -n "Status: Login Failed" + echo "Status: Login Failed" wx-stop fi @@ -196,7 +196,7 @@ wx-login(){ echo $wxBold$ORG$wxNormal - echo -n "Status: Vault Offline" + echo "Status: Vault Offline" wx-stop fi }