diff --git a/wx b/wx index 9d8f5b1..80c1a06 100755 --- a/wx +++ b/wx @@ -129,19 +129,19 @@ wxi-config-legacy(){ login) case $2 in write) - jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp + jq '.login.'$ORG'.token = "'$TOKEN'"' $WX_HOME/config.json &> $WX_HOME/config.json.tmp ;; read) - if [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]] + if [[ -f "$WX_HOME/config.json" && $(cat$WX_HOME/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $WX_HOME/config.json | jq -r .login.$ORG.token) != '' ]] then - cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token + cat $WX_HOME/config.json | jq -r .login.$ORG.token else return 1 fi ;; erase) TOKEN="" - wxi-config login write + wxi-config-legacy login write ;; esac ;; @@ -150,7 +150,7 @@ wxi-config-legacy(){ ;; esac - mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null + mv $WX_HOME/config.json.tmp $WX_HOME/config.json &> /dev/null } wxi-restricted(){ @@ -670,9 +670,9 @@ wx-logout(){ wxi-restricted --org wxi-restricted --vault - if [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' ]] + if [[ -f "$WX_HOME/config.json" && $(cat $WX_HOME/config.json | jq -r .login.$ORG.token) != 'null' ]] then - TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) + TOKEN=$(cat $WX_HOME/config.json | jq -r .login.$ORG.token) fi VAULT_STATUS=$(curl https://$VAULT_DOMAIN/v1/auth/token/revoke-self -X POST --header "X-Vault-Token: $TOKEN" -s -o /dev/null -w "%{http_code}")