1
0
Fork 0
mirror of synced 2024-06-02 23:01:09 -04:00

Compare commits

..

2 commits

Author SHA1 Message Date
Adrian Calinescu 3380852f3a
Merge f5b086c89c into 5354501a5b 2023-12-18 07:49:43 -08:00
Gregory Pakosz 5354501a5b made _pane_info() aware of teleport's 'tsh proxy ssh' command, fixes #690 2023-12-18 08:59:56 +01:00

View file

@ -525,7 +525,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration'
# case "$_uname_s" in # case "$_uname_s" in
# *CYGWIN*) # *CYGWIN*)
# ps -al | tail -n +2 | awk -v pane_pid="$pane_pid" -v tty="$pane_tty" ' # 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 # user[$1] = $6; if (!child[$2]) child[$2] = $1
# } # }
# END { # END {
@ -542,7 +542,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration'
# ;; # ;;
# *Linux*) # *Linux*)
# ps -t "$pane_tty" --sort=lstart -o user=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -o pid= -o ppid= -o command= | awk -v pane_pid="$pane_pid" ' # 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) # user[$2] = $1; if (!child[$3]) child[$3] = $2; pid=$2; $1 = $2 = $3 = ""; command[pid] = substr($0,4)
# } # }
# END { # END {
@ -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" ' # 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) # user[$2] = $1; if (!child[$3]) child[$3] = $2; pid=$2; $1 = $2 = $3 = ""; command[pid] = substr($0,4)
# } # }
# END { # END {