From d8ca48066b95d9762323998a3341b8381f5c4a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sat, 28 Nov 2020 18:00:17 +0100
Subject: [PATCH] rename function, fix promptcommandmunge

---
 bashrc_add   |  2 +-
 functions.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index b62efbd..d534cc9 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -170,7 +170,7 @@ EOF
     # source loading workaround for x2go to forward local etoken to remote machine with forwardagent
     . "${MYSHELLCONFIG_BASE}/myshell_load_x2go_tokenforward"
 
-    promptcommandmunge "_prompt_command"
+    promptcommandmunge "_tmux_hook"
     promptcommandmunge "_umask_hook"
     which direnv >/dev/null && eval "$(direnv hook bash)"
   
diff --git a/functions.sh b/functions.sh
index 09f2d18..f9daaf3 100755
--- a/functions.sh
+++ b/functions.sh
@@ -8,21 +8,21 @@ export TMUX_SESSION_DIRS SETPROXY_CREDS_DIRS KERBEROS_CONFIG_DIRS
 
 promptcommandmunge () {
     ENTRY
-    case ":${PROMPT_COMMAND}:" in
-        *:"$1":*)
+    case ";${PROMPT_COMMAND};" in
+        "*;$1;*")
             ;;
         *)
             if [ "$2" = "after" ] ; then
-                PROMPT_COMMAND=$PROMPT_COMMAND:$1
+                PROMPT_COMMAND="${PROMPT_COMMAND};$1"
             else
-                PROMPT_COMMAND=$1:$PROMPT_COMMAND
+                PROMPT_COMMAND="$1;${PROMPT_COMMAND}"
             fi
     esac
     EXIT
 }
 ## 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() {
+function _tmux_hook() {
 #    [ -z "${TMUX+x}" ] || eval "$(tmux show-environment -s)"
 
     if [ -n "${TMUX}" ]; then
@@ -32,7 +32,7 @@ function _prompt_command() {
 }
 
 # Append `;` if PROMPT_COMMAND is not empty
-#PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND;}_prompt_command"
+#PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND;}_tmux_hook"
 
 
 # To make the code more reliable on detecting the default umask