Skip to content

Commit

Permalink
made _pane_info() aware of teleport's 'tsh proxy ssh' command, fixes g…
Browse files Browse the repository at this point in the history
  • Loading branch information
gpakosz committed Dec 18, 2023
1 parent 1b88bf2 commit 5354501
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,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/) || !/ssh/) && !/tee/ && $5 == tty {
# ((/ssh/ && !/-W/ && !/tsh proxy ssh/) || !/ssh/) && !/tee/ && $5 == tty {
# user[$1] = $6; if (!child[$2]) child[$2] = $1
# }
# END {
Expand All @@ -542,7 +542,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/) || !/ssh/) && !/tee/ {
# ((/ssh/ && !/-W/ && !/tsh proxy ssh/) || !/ssh/) && !/tee/ {
# user[$2] = $1; if (!child[$3]) child[$3] = $2; pid=$2; $1 = $2 = $3 = ""; command[pid] = substr($0,4)
# }
# END {
Expand All @@ -556,7 +556,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/) || !/ssh/) && !/tee/ {
# ((/ssh/ && !/-W/ && !/tsh proxy ssh/) || !/ssh/) && !/tee/ {
# user[$2] = $1; if (!child[$3]) child[$3] = $2; pid=$2; $1 = $2 = $3 = ""; command[pid] = substr($0,4)
# }
# END {
Expand Down

0 comments on commit 5354501

Please sign in to comment.