mirror of
1
0
Fork 0

Compare commits

...

3 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
Adrian Calinescu f5b086c89c
Works with the new Windows Terminal (plus screenshot) 2019-10-15 09:06:42 +03:00
2 changed files with 12 additions and 3 deletions

View File

@ -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 {
@ -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 {
@ -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 {

View File

@ -108,6 +108,13 @@ Troubleshooting
one, Powerline symbols will be broken.
The alternative is to use the [Mintty terminal for WSL][wsltty].
- **Will this work with the new [Windows Terminal]?**
Yes, yes it will. Here's a screenshot:
![image](https://user-images.githubusercontent.com/6472374/66804257-a8225d00-ef2a-11e9-901a-318a3a22151f.png)
[1681]: https://github.com/Microsoft/BashOnWindows/issues/1681
[wsltty]: https://github.com/mintty/wsltty
@ -384,3 +391,5 @@ font.
![regedit](https://cloud.githubusercontent.com/assets/553208/19741304/71a2f3ae-9bc0-11e6-96aa-4c09a812c313.png)
[font linking]: https://msdn.microsoft.com/en-us/goglobal/bb688134.aspx
[Windows Terminal]: https://github.com/microsoft/terminal