warengroup/wx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code Update

Browse Source
This commit is contained in:
Christer Warén
2025-06-22 01:03:54 +03:00
parent 1a99d2e2a1
commit b689294bb4
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands/auth/login.sh
View File

@ -67,7 +67,10 @@ wx-login(){
if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]] if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]]
then 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)" TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)"
fi fi
@ -95,8 +98,8 @@ wx-login(){
echo "Username: $USERNAME" echo "Username: $USERNAME"
fi fi
jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp #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 #mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
echo -n "Password: " echo -n "Password: "
read -s PASSWORD read -s PASSWORD

9
wx
View File

@ -297,7 +297,10 @@ wx-login(){
if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]] if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]]
then 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)" TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)"
fi fi
@ -325,8 +328,8 @@ wx-login(){
echo "Username: $USERNAME" echo "Username: $USERNAME"
fi fi
jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp #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 #mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
echo -n "Password: " echo -n "Password: "
read -s PASSWORD read -s PASSWORD