From 00ff3298acbf7b0978300cfb2587dcd445ac620f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Mon, 30 Nov 2020 09:43:27 +0100
Subject: [PATCH] fix variables, start tmux at the very end

---
 bashrc_add            | 20 +++++++++++---------
 myshell_load_defaults |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 130e7ed..f06bb60 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -175,8 +175,16 @@ EOF
     promptcommandmunge "_umask_hook"
     which direnv >/dev/null && eval "$(direnv hook bash)"
   
+    cat << EOF >> "${MYSHELLCONFIG_LOGFILE}"
+==8<=== finished configure new shell ================ $(date) ===============8<==
+
+EOF
+#else
+#    echo "non-interactive shell" >&2
+    SCRIPTEXIT
+
     # Start tmux if not defined as STARTTMUX in bashrc
-    logwarn "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT-$STARTTMUX}"
+    logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT-$STARTTMUX}"
     if ${STARTTMUXDEFAULT-$STARTTMUX} ; then
         cat << EOF
 
@@ -189,14 +197,8 @@ EOF
         sleep 1
         #screen -UxR
         tmux attach-session
-        logwarn "started tmux"
+        logdebug "started tmux"
     fi
-    logwarn "after"
-    cat << EOF >> "${MYSHELLCONFIG_LOGFILE}"
-==8<=== finished configure new shell ================ $(date) ===============8<==
+    logdebug "after"
 
-EOF
-#else
-#    echo "non-interactive shell" >&2
-    SCRIPTEXIT
 fi
diff --git a/myshell_load_defaults b/myshell_load_defaults
index 5ada0de..9add397 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -81,7 +81,7 @@ if ! $SSHS; then
 
     # Start tmux if not defined as STARTTMUX in bashrc
     if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
-            STARTTMUX=true
+            STARTTMUXDEFAULT=true
     fi
 
     unset -f pathmunge