Move _stop_and_wait() to correct section
This commit is contained in:
parent
743bb87c96
commit
f5ffd7272d
18
mcserver
18
mcserver
@ -8,6 +8,15 @@ die () {
|
|||||||
exit 1
|
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
|
# directories
|
||||||
mcserver_root="${XDG_DATA_HOME:-${HOME}/.local/share}/mcserver"
|
mcserver_root="${XDG_DATA_HOME:-${HOME}/.local/share}/mcserver"
|
||||||
instances_dir="$mcserver_root/instances"
|
instances_dir="$mcserver_root/instances"
|
||||||
@ -46,15 +55,6 @@ source ./vars
|
|||||||
# override value defined in vars for compatibility with old servers
|
# override value defined in vars for compatibility with old servers
|
||||||
TMUX_SESSION=mcserver-"$instance"
|
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
|
case "$cmd" in
|
||||||
stop) _stop_and_wait ;;
|
stop) _stop_and_wait ;;
|
||||||
command) tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" "$*" "$code_send" ;;
|
command) tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" "$*" "$code_send" ;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user