From 84be8e371c5aba06035dd3b1d1c2dfd68f6354ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 09:48:40 +0100
Subject: [PATCH] fix local and remote start of tmux

---
 bashrc_add            | 5 ++---
 defaults.conf         | 2 ++
 myshell_load_defaults | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 70e2c4b..325e89c 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -11,7 +11,6 @@
 
 # set some variables to defaults, if not set in .bashrc
 [ -z ${SSHS+x} ] && export SSHS=false
-[ -z ${STARTTMUX+x} ] && export STARTTMUX=false
 
 # check if we are a interactive shell
 # https://guide.bash.academy/expansions/
@@ -204,8 +203,8 @@ EOF
     SCRIPTEXIT
 
     # Start tmux if not defined as STARTTMUX in bashrc
-    logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT-$STARTTMUX}"
-    if ${STARTTMUXDEFAULT-$STARTTMUX} ; then
+    logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT-$STARTTMUX}"
+    if ${STARTTMUX-$STARTTMUXDEFAULT} ; then
         cat << EOF
 
 "User: $USER - $UID"
diff --git a/defaults.conf b/defaults.conf
index 9f514cf..a2c83dc 100644
--- a/defaults.conf
+++ b/defaults.conf
@@ -13,3 +13,5 @@ export MSC_LOGLEVEL_DEFAULT="INFO"
 export MSC_FILELOGLEVEL_DEFAULT="DEBUG"
 export LOGLEVEL_DEFAULT="${MSC_LOGLEVEL_DEFAULT}"
 export FILELOGLEVEL_DEFAULT="${MSC_FILELOGLEVEL_DEFAULT}"
+export STARTTMUXDEFAULT=false
+export STARTTMUXREMOTEDEFAULT=true
diff --git a/myshell_load_defaults b/myshell_load_defaults
index cf93e44..fcc2bf5 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
-            STARTTMUXDEFAULT=true
+            STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
     fi
 
     unset -f pathmunge