From 0640c8febcbd8b28692706dc91b29e0e59b24892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Tue, 26 May 2020 10:47:22 +0200
Subject: [PATCH 1/2] change TMUX to TMUX_BIN to avoid conflicts

---
 functions.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions.sh b/functions.sh
index 9113868..cd4fe4a 100644
--- a/functions.sh
+++ b/functions.sh
@@ -437,10 +437,10 @@ function tmuxx() {
             echo no session specified return
             ;;
     esac
-    TMUX='/usr/bin/tmux'
-    $TMUX -f ~/.tmux.conf new-session -d
-    [ -e ${SESS[0]} ] && $TMUX source-file ${SESS[0]}
-    $TMUX attach-session -d
+    TMUX_BIN='/usr/bin/tmux'
+    $TMUX_BIN -f ~/.tmux.conf new-session -d
+    [ -e ${SESS[0]} ] && $TMUX_BIN source-file ${SESS[0]}
+    $TMUX_BIN attach-session -d
 }
 
 

From 9b55204cfad4b0b5615d114a6371231bab18898f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 9 Jul 2020 21:56:55 +0200
Subject: [PATCH 2/2] export USERNAME, USEREMAIL, FULLNAME earlier

---
 functions.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/functions.sh b/functions.sh
index 636a000..d2511a6 100755
--- a/functions.sh
+++ b/functions.sh
@@ -271,7 +271,7 @@ sshs() {
 
     local f
     local TMPBASHCONFIG=$(mktemp -p ${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf)
-    local FILELIST=( $(getbashrcfile) ~/.aliases "${MYSHELLCONFIG_BASE}/functions.sh" "${MYSHELLCONFIG_BASE}/aliases" "${MYSHELLCONFIG_BASE}/PS1" "${MYSHELLCONFIG_BASE}/bash_completion.d/*" "${MYSHELLCONFIG_BASE}/myshell_load_fortmpconfig" )
+    local FILELIST=( "${MYSHELLCONFIG_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.aliases "${MYSHELLCONFIG_BASE}/functions.sh" "${MYSHELLCONFIG_BASE}/aliases" "${MYSHELLCONFIG_BASE}/PS1" "${MYSHELLCONFIG_BASE}/bash_completion.d/*" )
 
     local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%r@%h:%p"
     # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first
@@ -280,6 +280,10 @@ sshs() {
 [ -e /etc/bash.bashrc ] && BASHRC=/etc/bash.bashrc
 . \$BASHRC
 
+export USERNAME="${USERNAME}"
+export FULLNAME="${FULLNAME}"
+export USEREMAIL="${USEREMAIL}"
+
 for i in /etc/profile.d/*.sh; do
     if [ -r "$i" ];then
         if [ "$PS1" ]; then