diff --git a/bashrc_add b/bashrc_add index 70da519..628c507 100755 --- a/bashrc_add +++ b/bashrc_add @@ -11,7 +11,8 @@ if [[ $- = *i* ]] ; then #echo "interactive shell" >&2 # define variables - [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=0 + [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=500 + [ -z "${MYSHELLCONFIIG_USER_TMOUT+x}" ] && MYSHELLCONFIIG_USER_TMOUT=0 [ -z "${USERNAME+x}" ] && USERNAME="$USER" [ -z "${USEREMAIL+x}" ] && USEREMAIL="$USER@$(domainname -f)" [ -z "${FULLNAME+x}" ] && FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)" @@ -33,8 +34,6 @@ if [[ $- = *i* ]] ; then SGIT="git -C ${MYSHELLCONFIG_BASE}" export MYSHELLCONFIG_BASE MYSHELLCONFIG_LOGDIR MYSHELLCONFIG_LOGFILE SGIT MYSHELLCONFIG_VIM_PLUGINS - # if we are root, exit after 5 Minutes - [ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT} cat << EOF >> "${MYSHELLCONFIG_LOGFILE}" ------- start -------------- $(date) ---------------8<-- diff --git a/myshell_load_defaults b/myshell_load_defaults index 48fe265..876eeea 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -1,5 +1,9 @@ #!/bin/bash +# if we are root, exit after 5 Minutes +[ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT} +[ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIIG_USER_TMOUT} + # Load default values, functions, aliases for myshellconfig if ! $SSHS; then if [ -e ${MYSHELLCONFIG_BASE}/functions.sh ]; then