diff --git a/src/commands/auth/login.sh b/src/commands/auth/login.sh index b38a333..a9a99f1 100644 --- a/src/commands/auth/login.sh +++ b/src/commands/auth/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 diff --git a/src/commands/auth/logout.sh b/src/commands/auth/logout.sh index f4dd649..3c6b025 100644 --- a/src/commands/auth/logout.sh +++ b/src/commands/auth/logout.sh @@ -1,13 +1,13 @@ wx-logout(){ wx-header "Logout" - if [[ $USER != "root" && $USER != "local" && -f "$HOME/.config/warengroup/config.json" ]] + if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]] then - VAULT_LOGIN=$(cat $HOME/.config/warengroup/config.json | jq -r .login) + VAULT_LOGIN=$(cat $HOME/.warengroup/config.json | jq -r .login) if [[ $VAULT_LOGIN != null && $VAULT_LOGIN != "{}" ]] then wx-clean &> /dev/null - jq '.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 = {}' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp + mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null fi fi } diff --git a/src/commands/maintenance/uninstall.sh b/src/commands/maintenance/uninstall.sh index 604aedb..56ba6a4 100644 --- a/src/commands/maintenance/uninstall.sh +++ b/src/commands/maintenance/uninstall.sh @@ -1,8 +1,8 @@ wx-uninstall(){ wx-header "Uninstall" wx-logout - if [[ ! -d "$HOME/.config/warengroup" ]] + if [[ ! -d "$HOME/.warengroup" ]] then - rm "$HOME/.config/warengroup" -rf + rm "$HOME/.warengroup" -rf fi } diff --git a/src/functions/start.sh b/src/functions/start.sh index 647759c..39f0ed4 100644 --- a/src/functions/start.sh +++ b/src/functions/start.sh @@ -3,11 +3,11 @@ wx-start(){ if [[ $USER != "root" && $USER != "local" ]] then - mkdir -p $HOME/.config/warengroup &> /dev/null + mkdir -p $HOME/.warengroup &> /dev/null - if [[ ! -f "$HOME/.config/warengroup/config.json" ]] + if [[ ! -f "$HOME/.warengroup/config.json" ]] then - echo '{}' | jq > $HOME/.config/warengroup/config.json + echo '{}' | jq > $HOME/.warengroup/config.json fi mkdir -p $HOME/.ssh/keys diff --git a/wx b/wx index a65b20a..1b41cce 100755 --- a/wx +++ b/wx @@ -66,11 +66,11 @@ wx-start(){ if [[ $USER != "root" && $USER != "local" ]] then - mkdir -p $HOME/.config/warengroup &> /dev/null + mkdir -p $HOME/.warengroup &> /dev/null - if [[ ! -f "$HOME/.config/warengroup/config.json" ]] + if [[ ! -f "$HOME/.warengroup/config.json" ]] then - echo '{}' | jq > $HOME/.config/warengroup/config.json + echo '{}' | jq > $HOME/.warengroup/config.json fi mkdir -p $HOME/.ssh/keys @@ -306,9 +306,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') @@ -317,8 +317,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) @@ -355,8 +355,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 @@ -384,8 +384,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 @@ -399,14 +399,14 @@ wx-login(){ wx-logout(){ wx-header "Logout" - if [[ $USER != "root" && $USER != "local" && -f "$HOME/.config/warengroup/config.json" ]] + if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]] then - VAULT_LOGIN=$(cat $HOME/.config/warengroup/config.json | jq -r .login) + VAULT_LOGIN=$(cat $HOME/.warengroup/config.json | jq -r .login) if [[ $VAULT_LOGIN != null && $VAULT_LOGIN != "{}" ]] then wx-clean &> /dev/null - jq '.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 = {}' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp + mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null fi fi } @@ -434,9 +434,9 @@ wx-install(){ wx-uninstall(){ wx-header "Uninstall" wx-logout - if [[ ! -d "$HOME/.config/warengroup" ]] + if [[ ! -d "$HOME/.warengroup" ]] then - rm "$HOME/.config/warengroup" -rf + rm "$HOME/.warengroup" -rf fi }