diff --git a/mcserver b/mcserver index 57b8743..0bb91fa 100755 --- a/mcserver +++ b/mcserver @@ -9,7 +9,7 @@ die () { } _stop_and_wait () { - tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" 'stop' "$code_send" + tmux $TMUX_OPTS send-keys -t "$TMUX_SESSION" -l "$code_clear" 'stop' "$code_send" echo Waiting for session to exit... while tmux has-session -t "$TMUX_SESSION" ; do sleep 1 @@ -54,9 +54,11 @@ source ./vars # override value defined in vars for compatibility with old servers TMUX_SESSION=mcserver-"$instance" +# set socket for tmux to separate it from user sessions +TMUX_OPTS="-L mcserver" case "$cmd" in stop) _stop_and_wait ;; - command) tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" "$*" "$code_send" ;; - start|*) tmux new-window -t $TMUX_SESSION: "./start.sh" || tmux new-session -d -s $TMUX_SESSION "./start.sh";; + command) tmux $TMUX_OPTS send-keys -t "$TMUX_SESSION" -l "$code_clear" "$*" "$code_send" ;; + start|*) tmux $TMUX_OPTS new-window -t $TMUX_SESSION: "./start.sh" || tmux new-session -d -s $TMUX_SESSION "./start.sh";; esac