diff --git a/mcserver b/mcserver index d8a03ff..57b8743 100755 --- a/mcserver +++ b/mcserver @@ -8,6 +8,15 @@ die () { exit 1 } +_stop_and_wait () { + tmux 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 + done +} + + # directories mcserver_root="${XDG_DATA_HOME:-${HOME}/.local/share}/mcserver" instances_dir="$mcserver_root/instances" @@ -46,15 +55,6 @@ source ./vars # override value defined in vars for compatibility with old servers TMUX_SESSION=mcserver-"$instance" -_stop_and_wait () { - tmux 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 - done -} - - case "$cmd" in stop) _stop_and_wait ;; command) tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" "$*" "$code_send" ;;