Use correct user on login and logout

binbashar · Oct 30, 2024 · bc62eef · bc62eef
1 parent f770688
commit bc62eef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/scripts/aws-sso/aws-sso-login.sh b/scripts/aws-sso/aws-sso-login.sh
@@ -30,11 +30,13 @@ function log {
 # -----------------------------------------------------------------------------
 # Initialize variables
 # -----------------------------------------------------------------------------
+USR=$(whoami)
+USR_HOME=$([ "$USR" != "root" ] && echo "home/$USR")
 SCRIPT_LOG_LEVEL=${SCRIPT_LOG_LEVEL:-2}
 PROJECT=$(hcledit -f "$COMMON_CONFIG_FILE" attribute get project | sed 's/"//g')
 SSO_PROFILE_NAME=${SSO_PROFILE_NAME:-$PROJECT-sso}
-SSO_CACHE_DIR=${SSO_CACHE_DIR:-/home/leverage/tmp/$PROJECT/sso/cache}
-AWS_SSO_CACHE_DIR=/home/leverage/.aws/sso/cache
+SSO_CACHE_DIR=${SSO_CACHE_DIR:-"/${USR_HOME}/tmp/$PROJECT/sso/cache"}
+AWS_SSO_CACHE_DIR="/${USR_HOME}/.aws/sso/cache"
 SSO_TOKEN_FILE_NAME='token'
 debug "SCRIPT_LOG_LEVEL=$SCRIPT_LOG_LEVEL"
 debug "COMMON_CONFIG_FILE=$COMMON_CONFIG_FILE"

diff --git a/scripts/aws-sso/aws-sso-logout.sh b/scripts/aws-sso/aws-sso-logout.sh
@@ -30,9 +30,11 @@ function log {
 # -----------------------------------------------------------------------------
 # Initialize variables
 # -----------------------------------------------------------------------------
+USR=$(whoami)
+USR_HOME=$([ "$USR" != "root" ] && echo "home/$USR")
 SCRIPT_LOG_LEVEL=${SCRIPT_LOG_LEVEL:-2}
 PROJECT=$(hcledit -f "$COMMON_CONFIG_FILE" attribute get project | sed 's/"//g')
-SSO_CACHE_DIR=${SSO_CACHE_DIR:-/home/leverage/tmp/$PROJECT/sso/cache}
+SSO_CACHE_DIR=${SSO_CACHE_DIR:-"/${USR_HOME}/tmp/$PROJECT/sso/cache"}
 debug "SCRIPT_LOG_LEVEL=$SCRIPT_LOG_LEVEL"
 debug "AWS_SHARED_CREDENTIALS_FILE=$AWS_SHARED_CREDENTIALS_FILE"
 debug "AWS_CONFIG_FILE=$AWS_CONFIG_FILE"