diff --git a/src/commands/auth/login.sh b/src/commands/auth/login.sh index bdffb36..3561080 100644 --- a/src/commands/auth/login.sh +++ b/src/commands/auth/login.sh @@ -67,7 +67,10 @@ wx-login(){ if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]] then - USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)" + #if [[ $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username) != "null" ]] + #then + #USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)" + #fi TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)" fi @@ -95,8 +98,8 @@ wx-login(){ echo "Username: $USERNAME" fi - jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp - mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null + #jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp + #mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null echo -n "Password: " read -s PASSWORD diff --git a/wx b/wx index 7c3eae6..9506488 100755 --- a/wx +++ b/wx @@ -297,7 +297,10 @@ wx-login(){ if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]] then - USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)" + #if [[ $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username) != "null" ]] + #then + #USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)" + #fi TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)" fi @@ -325,8 +328,8 @@ wx-login(){ echo "Username: $USERNAME" fi - jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp - mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null + #jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp + #mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null echo -n "Password: " read -s PASSWORD