From 2d6a4a5d059ff6e63f6da8b3f50cfe0c83599f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 12 Mar 2020 20:48:27 +0100 Subject: [PATCH] fix typo in variable, change from if to case --- bashrc_add | 4 ++-- myshell_load_defaults | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bashrc_add b/bashrc_add index 628c507..774ce44 100755 --- a/bashrc_add +++ b/bashrc_add @@ -11,8 +11,8 @@ if [[ $- = *i* ]] ; then #echo "interactive shell" >&2 # define variables - [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=500 - [ -z "${MYSHELLCONFIIG_USER_TMOUT+x}" ] && MYSHELLCONFIIG_USER_TMOUT=0 + [ -z "${MYSHELLCONFIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIG_ROOT_TMOUT=500 + [ -z "${MYSHELLCONFIG_USER_TMOUT+x}" ] && MYSHELLCONFIG_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)" diff --git a/myshell_load_defaults b/myshell_load_defaults index be7f2d3..5a6c6c7 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -3,8 +3,16 @@ # if we are root, exit after 5 Minutes case $(tty) in /dev/tty[0-9]*) - [ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT} - [ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIIG_USER_TMOUT} + #[ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIG_ROOT_TMOUT} + #[ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIG_USER_TMOUT} + case $(id u) in + 0) + TMOUT=${MYSHELLCONFIG_ROOT_TMOUT} + ;; + *) + TMOUT=${MYSHELLCONFIG_USER_TMOUT} + ;; + esac echo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2 ;; *)