From 101b59136092629f729733fead74d17517acd5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Wed, 23 Sep 2020 09:53:37 +0200
Subject: [PATCH] move function for tmux env update, enrich sudo

---
 functions.sh                   | 12 ++++++++++++
 myshell_load_x2go_tokenforward |  6 ------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/functions.sh b/functions.sh
index a977ac3..838f326 100755
--- a/functions.sh
+++ b/functions.sh
@@ -6,6 +6,17 @@
 
 export TMUX_SESSION_DIRS SETPROXY_CREDS_DIRS KERBEROS_CONFIG_DIRS
 
+## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmus-sessions,
+#  every time prompt is called. It does it only, when called from tmux (Environment TMUX is set)
+function prompt_command() {
+    [ -z "${TMUX+x}" ] || eval "$(tmux show-environment -s)"
+
+#    if [ -n "${TMUX}" ]; then
+#        eval "$(tmux show-environment -s)"
+#    fi
+}
+PROMPT_COMMAND=prompt_command
+
 
 cpb() {
     scp "$1" ${SSH_CLIENT%% *}:~/Work
@@ -22,6 +33,7 @@ sudo() {
         TMUX="$TMUX" \
         SSHS="$SSHS" \
         SSH_TTY="$SSH_TTY" \
+        SSH_AUTH_SOCK="$SSH_AUTH_SOCK" \
         "$@"
 
 }
diff --git a/myshell_load_x2go_tokenforward b/myshell_load_x2go_tokenforward
index 9c7cedc..e2a7dd6 100644
--- a/myshell_load_x2go_tokenforward
+++ b/myshell_load_x2go_tokenforward
@@ -50,9 +50,3 @@ fi
 # ---- END X2Go SSH forwarding workaround ----
 
 #https://www.johntobin.ie/blog/updating_environment_variables_from_tmux/
-function prompt_command() {
-    if [ -n "${TMUX}" ]; then
-        eval "$(tmux show-environment -s)"
-    fi
-}
-PROMPT_COMMAND=prompt_command