diff --git a/src/commands/auth/login.sh b/src/commands/auth/login.sh index bdffb36..7940996 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 diff --git a/src/functions/start.sh b/src/functions/start.sh index 39f0ed4..0a51d0b 100644 --- a/src/functions/start.sh +++ b/src/functions/start.sh @@ -4,8 +4,9 @@ wx-start(){ if [[ $USER != "root" && $USER != "local" ]] then mkdir -p $HOME/.warengroup &> /dev/null + touch $HOME/.warengroup/config.json &> /dev/null - if [[ ! -f "$HOME/.warengroup/config.json" ]] + if [[ ! -f "$HOME/.warengroup/config.json" || $(cat $HOME/.warengroup/config.json | jq -e . >/dev/null 2>&1 | echo ${PIPESTATUS[1]}) -gt 0 ]] then echo '{}' | jq > $HOME/.warengroup/config.json fi diff --git a/wx b/wx index 7c3eae6..a1d7d0c 100755 --- a/wx +++ b/wx @@ -67,8 +67,9 @@ wx-start(){ if [[ $USER != "root" && $USER != "local" ]] then mkdir -p $HOME/.warengroup &> /dev/null + touch $HOME/.warengroup/config.json &> /dev/null - if [[ ! -f "$HOME/.warengroup/config.json" ]] + if [[ ! -f "$HOME/.warengroup/config.json" || $(cat $HOME/.warengroup/config.json | jq -e . >/dev/null 2>&1 | echo ${PIPESTATUS[1]}) -gt 0 ]] then echo '{}' | jq > $HOME/.warengroup/config.json fi @@ -297,7 +298,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