From 945b2f8348a78139f8ba3591c0858b10517d0f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 12 Mar 2020 20:59:57 +0100
Subject: [PATCH] use bash parameter-expansion

---
 bashrc_add            | 5 +++--
 myshell_load_defaults | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 774ce44..d5bb109 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -11,8 +11,9 @@ if [[ $- = *i* ]] ; then
     #echo "interactive shell" >&2
 
     # define variables
-    [ -z "${MYSHELLCONFIG_ROOT_TMOUT+x}" ]  && MYSHELLCONFIG_ROOT_TMOUT=500
-    [ -z "${MYSHELLCONFIG_USER_TMOUT+x}" ]  && MYSHELLCONFIG_USER_TMOUT=0
+    # default timeouts definted in myshellconfig_load_default
+    #[ -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 5a6c6c7..96b1427 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -7,10 +7,10 @@ case $(tty) in
         #[ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIG_USER_TMOUT}
         case $(id u) in
             0)
-                TMOUT=${MYSHELLCONFIG_ROOT_TMOUT}
+                TMOUT=${MYSHELLCONFIG_ROOT_TMOUT:-500}
                 ;;
             *)
-                TMOUT=${MYSHELLCONFIG_USER_TMOUT}
+                TMOUT=${MYSHELLCONFIG_USER_TMOUT:-0}
                 ;;
         esac
         echo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2