Skip to content

Commit 776dbf3

Browse files
committed
fix
Signed-off-by: kpango <kpango@vdaas.org>
1 parent 07318f2 commit 776dbf3

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

zsh/01-tmux.zsh

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,8 @@ export _ZSH_TMUX_LOADED=1
44
if (($+commands[tmux])); then
55
if [ -z "$_TMUX_KEYS_SET" ] && [ -n "$TMUX" ]; then
66
export _TMUX_KEYS_SET=1
7-
# Extract socket path from TMUX (format: socket,pid,session)
8-
local _tmux_sock="${TMUX%%,*}"
9-
local _expected_prefix="/tmp/tmux-sockets/${UID}/${HOST}"
107
if [ -f /.dockerenv ]; then
11-
# Only change prefix when TMUX socket belongs to this container's own server,
12-
# not a host socket inherited via docker exec -e TMUX=...
13-
if [[ "$_tmux_sock" == "$_expected_prefix"* ]]; then
14-
tmux unbind C-b \; set -g prefix C-w \; bind C-w send-prefix &|
15-
fi
8+
tmux unbind C-b \; set -g prefix C-w \; bind C-w send-prefix &|
169
else
1710
case ${OSTYPE} in
1811
darwin*)
@@ -45,12 +38,14 @@ if (($+commands[tmux])); then
4538
USER=${USER:-$USERNAME}
4639
HOST=${HOST:-$HOSTNAME}
4740
TMUX_TMPDIR_PREFIX="/tmp/tmux-sockets/${UID}"
48-
TMUX_TMPDIR="$TMUX_TMPDIR_PREFIX/$HOST"
49-
# If connected via SSH
50-
if [[ -n "$SSH_CLIENT" ]]; then
41+
if [[ -f /.dockerenv ]]; then
42+
TMUX_TMPDIR="$TMUX_TMPDIR_PREFIX/docker"
43+
elif [[ -n "$SSH_CLIENT" ]]; then
5144
SSH_IP="${SSH_CLIENT%% *}"
5245
TMUX_TMPDIR="$TMUX_TMPDIR_PREFIX/ssh/$SSH_IP"
5346
echo "starting tmux for ssh $SSH_TTY from $SSH_CLIENT"
47+
else
48+
TMUX_TMPDIR="$TMUX_TMPDIR_PREFIX/$HOST"
5449
fi
5550
export TMUX_TMPDIR=$TMUX_TMPDIR
5651

0 commit comments

Comments
 (0)