diff --git a/init.sh b/init.sh index d504527..5fe8358 100755 --- a/init.sh +++ b/init.sh @@ -190,7 +190,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 diff --git a/src/functions/login.sh b/src/functions/login.sh index bdffb36..7940996 100644 --- a/src/functions/login.sh +++ b/src/functions/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