From 48d4cec23ea9479504e69d86f8909384bd038453 Mon Sep 17 00:00:00 2001 From: Gregory Pakosz Date: Wed, 7 Feb 2024 10:32:18 +0100 Subject: [PATCH] made _pane_info() aware of the 'sss_ssh_knownhostsproxy' proxy command, fixes #718 --- .tmux.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.tmux.conf b/.tmux.conf index c07e25a..cde7174 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -571,7 +571,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration' # case "$_uname_s" in # *CYGWIN*) # ps -al | tail -n +2 | awk -v pane_pid="$pane_pid" -v tty="$pane_tty" ' -# ((/ssh/ && !/-W/ && !/tsh proxy ssh/) || !/ssh/) && !/tee/ && $5 == tty { +# ((/ssh/ && !/-W/ && !/tsh proxy ssh/ &!/sss_ssh_knownhostsproxy/) || !/ssh/) && !/tee/ && $5 == tty { # user[$1] = $6; if (!child[$2]) child[$2] = $1 # } # END { @@ -588,7 +588,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration' # ;; # *Linux*) # ps -t "$pane_tty" --sort=lstart -o user=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -o pid= -o ppid= -o command= | awk -v pane_pid="$pane_pid" ' -# ((/ssh/ && !/-W/ && !/tsh proxy ssh/) || !/ssh/) && !/tee/ { +# ((/ssh/ && !/-W/ && !/tsh proxy ssh/ && !/sss_ssh_knownhostsproxy/) || !/ssh/) && !/tee/ { # user[$2] = $1; if (!child[$3]) child[$3] = $2; pid=$2; $1 = $2 = $3 = ""; command[pid] = substr($0,4) # } # END { @@ -602,7 +602,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration' # ;; # *) # ps -t "/dev/$pane_tty" -o user=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -o pid= -o ppid= -o command= | awk -v pane_pid="$pane_pid" ' -# ((/ssh/ && !/-W/ && !/tsh proxy ssh/) || !/ssh/) && !/tee/ { +# ((/ssh/ && !/-W/ && !/tsh proxy ssh/ && !/sss_ssh_knownhostsproxy/) || !/ssh/) && !/tee/ { # user[$2] = $1; if (!child[$3]) child[$3] = $2; pid=$2; $1 = $2 = $3 = ""; command[pid] = substr($0,4) # } # END {