diff --git a/init.sh b/init.sh index 3393998..8eea8bf 100755 --- a/init.sh +++ b/init.sh @@ -191,9 +191,9 @@ wx-login(){ if [[ $VAULT_STATUS -eq 200 ]] then - if [[ $USER != "root" && $USER != "local" && -f "$HOME/.config/warengroup/config.json" ]] + if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]] then - TOKEN="$(cat $HOME/.config/warengroup/config.json | jq -r .login.$ORG)" + TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG)" 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') @@ -202,8 +202,8 @@ wx-login(){ config["login",${ORG}]=$VAULT_LOGIN if [[ $USER != "root" && $USER != "local" ]] then - jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.config/warengroup/config.json 1> $HOME/.config/warengroup/config.json.tmp - mv $HOME/.config/warengroup/config.json.tmp $HOME/.config/warengroup/config.json &> /dev/null + jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp + mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null fi else IDM_STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://$IDM_DOMAIN) @@ -240,8 +240,8 @@ wx-login(){ if [[ $USER != "root" && $USER != "local" ]] then - jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.config/warengroup/config.json &> $HOME/.config/warengroup/config.json.tmp - mv $HOME/.config/warengroup/config.json.tmp $HOME/.config/warengroup/config.json &> /dev/null + jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp + mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null fi fi else @@ -269,8 +269,8 @@ wx-login(){ if [[ $USER != "root" && $USER != "local" ]] then - jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.config/warengroup/config.json &> $HOME/.config/warengroup/config.json.tmp - mv $HOME/.config/warengroup/config.json.tmp $HOME/.config/warengroup/config.json &> /dev/null + jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp + mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null fi fi fi diff --git a/src/functions/login.sh b/src/functions/login.sh index b38a333..a9a99f1 100644 --- a/src/functions/login.sh +++ b/src/functions/login.sh @@ -79,9 +79,9 @@ wx-login(){ if [[ $VAULT_STATUS -eq 200 ]] then - if [[ $USER != "root" && $USER != "local" && -f "$HOME/.config/warengroup/config.json" ]] + if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]] then - TOKEN="$(cat $HOME/.config/warengroup/config.json | jq -r .login.$ORG)" + TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG)" 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') @@ -90,8 +90,8 @@ wx-login(){ config["login",${ORG}]=$VAULT_LOGIN if [[ $USER != "root" && $USER != "local" ]] then - jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.config/warengroup/config.json 1> $HOME/.config/warengroup/config.json.tmp - mv $HOME/.config/warengroup/config.json.tmp $HOME/.config/warengroup/config.json &> /dev/null + jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp + mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null fi else IDM_STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://$IDM_DOMAIN) @@ -128,8 +128,8 @@ wx-login(){ if [[ $USER != "root" && $USER != "local" ]] then - jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.config/warengroup/config.json &> $HOME/.config/warengroup/config.json.tmp - mv $HOME/.config/warengroup/config.json.tmp $HOME/.config/warengroup/config.json &> /dev/null + jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp + mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null fi fi else @@ -157,8 +157,8 @@ wx-login(){ if [[ $USER != "root" && $USER != "local" ]] then - jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.config/warengroup/config.json &> $HOME/.config/warengroup/config.json.tmp - mv $HOME/.config/warengroup/config.json.tmp $HOME/.config/warengroup/config.json &> /dev/null + jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp + mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null fi fi fi