From e1b05fbc51493a7088e44a1a25059f672b3eb80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Sat, 1 Jun 2024 01:53:48 +0300 Subject: [PATCH] Code Update --- src/commands/auto.sh | 4 ++-- src/commands/login.sh | 8 +++----- src/commands/logout.sh | 5 +++++ src/functions/header.sh | 3 +++ src/functions/start.sh | 14 +++++++------- wx | 34 ++++++++++++++++++++-------------- 6 files changed, 40 insertions(+), 28 deletions(-) diff --git a/src/commands/auto.sh b/src/commands/auto.sh index e0bd444..ccc4957 100644 --- a/src/commands/auto.sh +++ b/src/commands/auto.sh @@ -2,7 +2,7 @@ wx-auto(){ wx-login wx-header "Auto" - wx-ssh-config-sync - wx-ssh-keys-sync + wx-ssh-config sync + wx-ssh-keys sync wx-ssh-sign } diff --git a/src/commands/login.sh b/src/commands/login.sh index c01df39..a8b3450 100644 --- a/src/commands/login.sh +++ b/src/commands/login.sh @@ -73,6 +73,8 @@ wx-login(){ else USERNAME=$SUDO_USER fi + else + USERNAME=$USER fi VAULT_STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://$VAULT_DOMAIN/v1/sys/health) @@ -90,7 +92,7 @@ wx-login(){ config["login",${ORG}]=$VAULT_LOGIN if [[ $USER != "root" && $USER != "local" ]] then - jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.config/warengroup/config.json &> $HOME/.config/warengroup/config.json.tmp + 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 fi else @@ -131,8 +133,6 @@ wx-login(){ 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 fi - - wx-start fi else wx-header "Login" @@ -162,8 +162,6 @@ wx-login(){ 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 fi - - wx-start fi fi else diff --git a/src/commands/logout.sh b/src/commands/logout.sh index 82da082..71ef0a1 100644 --- a/src/commands/logout.sh +++ b/src/commands/logout.sh @@ -1,3 +1,8 @@ wx-logout(){ wx-header "Logout" + if [[ $USER != "root" && $USER != "local" ]] + then + 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 + fi } diff --git a/src/functions/header.sh b/src/functions/header.sh index 8182e87..8353695 100644 --- a/src/functions/header.sh +++ b/src/functions/header.sh @@ -1,6 +1,9 @@ wx-header(){ if [[ $2 == "h1" ]] then + echo "" + echo "" + echo "" echo "==============================" wx-repeat " " $((30/2-${#1}/2)) echo -n "$wxBold" diff --git a/src/functions/start.sh b/src/functions/start.sh index 17e21d7..c1397cd 100644 --- a/src/functions/start.sh +++ b/src/functions/start.sh @@ -1,13 +1,13 @@ wx-start(){ - echo "" - echo "" - echo "" wx-header "Warén CLI" h1 - mkdir -p $HOME/.config/warengroup &> /dev/null - - if [[ ! -f "$HOME/.config/warengroup/config.json" ]] + if [[ $USER != "root" && $USER != "local" ]] then - echo '{}' | jq > $HOME/.config/warengroup/config.json + mkdir -p $HOME/.config/warengroup &> /dev/null + + if [[ ! -f "$HOME/.config/warengroup/config.json" ]] + then + echo '{}' | jq > $HOME/.config/warengroup/config.json + fi fi } diff --git a/wx b/wx index 3d0f63d..d6f9f7c 100755 --- a/wx +++ b/wx @@ -22,6 +22,9 @@ declare -Ax config wx-header(){ if [[ $2 == "h1" ]] then + echo "" + echo "" + echo "" echo "==============================" wx-repeat " " $((30/2-${#1}/2)) echo -n "$wxBold" @@ -59,16 +62,16 @@ wx-restricted(){ } wx-start(){ - echo "" - echo "" - echo "" wx-header "Warén CLI" h1 - mkdir -p $HOME/.config/warengroup &> /dev/null - - if [[ ! -f "$HOME/.config/warengroup/config.json" ]] + if [[ $USER != "root" && $USER != "local" ]] then - echo '{}' | jq > $HOME/.config/warengroup/config.json + mkdir -p $HOME/.config/warengroup &> /dev/null + + if [[ ! -f "$HOME/.config/warengroup/config.json" ]] + then + echo '{}' | jq > $HOME/.config/warengroup/config.json + fi fi } @@ -86,8 +89,8 @@ wx-auto(){ wx-login wx-header "Auto" - wx-ssh-config-sync - wx-ssh-keys-sync + wx-ssh-config sync + wx-ssh-keys sync wx-ssh-sign } @@ -258,6 +261,8 @@ wx-login(){ else USERNAME=$SUDO_USER fi + else + USERNAME=$USER fi VAULT_STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://$VAULT_DOMAIN/v1/sys/health) @@ -275,7 +280,7 @@ wx-login(){ config["login",${ORG}]=$VAULT_LOGIN if [[ $USER != "root" && $USER != "local" ]] then - jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.config/warengroup/config.json &> $HOME/.config/warengroup/config.json.tmp + 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 fi else @@ -316,8 +321,6 @@ wx-login(){ 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 fi - - wx-start fi else wx-header "Login" @@ -347,8 +350,6 @@ wx-login(){ 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 fi - - wx-start fi fi else @@ -361,6 +362,11 @@ wx-login(){ wx-logout(){ wx-header "Logout" + if [[ $USER != "root" && $USER != "local" ]] + then + 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 + fi } wx-settings(){