From 7fe196faea9761c053eeb2fc582326a2fe47e6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 7 Feb 2021 21:26:14 +0100 Subject: [PATCH] add debug --- bashrc_add | 2 +- myshell_load_defaults | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/bashrc_add b/bashrc_add index 325e89c..6e5c37e 100755 --- a/bashrc_add +++ b/bashrc_add @@ -203,7 +203,7 @@ EOF SCRIPTEXIT # Start tmux if not defined as STARTTMUX in bashrc - logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT-$STARTTMUX}" + logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXREMOTEDEFAULT} - ${STARTTMUX-$STARTTMUXDEFAULT}" if ${STARTTMUX-$STARTTMUXDEFAULT} ; then cat << EOF diff --git a/myshell_load_defaults b/myshell_load_defaults index caeab5b..5e5fbf5 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -86,13 +86,24 @@ if ! $SSHS; then logwarn "SSH_TTY: $SSH_TTY" logwarn "TERM: $TERM" logwarn "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )" - 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=${STARTTMUXREMOTEDEFAULT} - logwarn "TEST1" - else - logwarn "TEST2" - STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT} + if test $SSH_TTY; then + logwarn "im remote" + if test ! $TMUX && $TERM != screen; then + logwarn "no screen" + if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then + logwarn "tmux@${USER} is running" + STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT} + fi + fi fi + +# 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=${STARTTMUXREMOTEDEFAULT} +# logwarn "TEST1" +# else +# logwarn "TEST2" +# STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT} +# fi logwarn "${STARTTMUXDEFAULT}" unset -f pathmunge