Skip to content

Commit 36c7d85

Browse files
authored
fix: use socket-path in autostart if set (#62)
1 parent d4ae93e commit 36c7d85

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

toggle-popup.tmux

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,27 @@ main() {
2626
set -goq @popup-toggle-mode "$DEFAULT_TOGGLE_MODE" \; \
2727
set -goq @popup-socket-name "$DEFAULT_SOCKET_NAME" \;
2828

29-
local autostart socket_name default_shell
29+
local autostart socket_name socket_path default_shell
3030
target='' batch_get_options \
3131
autostart="#{@popup-autostart}" \
3232
socket_name="#{@popup-socket-name}" \
33+
socket_path="#{@popup-socket-path}" \
3334
default_shell="#{default-shell}"
34-
default_shell=${default_shell:-$SHELL}
3535

3636
# Do not start itself within a popup server
3737
if [[ $autostart == "on" && -z $TMUX_POPUP_SERVER ]]; then
3838
(
39+
local args
40+
if [[ -n $socket_path ]]; then
41+
args=(-S "$socket_path")
42+
else
43+
args=(-L "$socket_name")
44+
fi
3945
# Set $TMUX_POPUP_SERVER to identify the popup server.
40-
export TMUX_POPUP_SERVER="$socket_name"
46+
export TMUX_POPUP_SERVER=$socket_name
4147
# Propagate user's default shell.
42-
export SHELL="$default_shell"
43-
tmux -L "$socket_name" set exit-empty off \; start
48+
export SHELL=${default_shell:-$SHELL}
49+
tmux "${args[@]}" set-option -g exit-empty off \; start-server
4450
) &
4551
fi
4652
}

0 commit comments

Comments
 (0)