nullbite/mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nullbite:743bb87c96f5a04e981ea11e07bf9d2386f09e23
Branches Tags
nullbite:main
...
compare: nullbite:324989996f980caf505d5205bc42ba3a2138bdf6
Branches Tags
nullbite:main

2 Commits
743bb87c96 ... 324989996f

Author SHA1 Message Date
NullBite
324989996f
Use dedicated socket for tmux 2023-06-17 13:48:44 -04:00
NullBite
f5ffd7272d
Move _stop_and_wait() to correct section 2023-06-17 13:41:21 -04:00
1 changed files with 13 additions and 11 deletions
Show Stats Expand all files Collapse all files

24
mcserver
View File

@ -8,6 +8,15 @@ die () {
exit 1 exit 1
} }
_stop_and_wait () {
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
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"
@ -45,18 +54,11 @@ 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"
# set socket for tmux to separate it from user sessions
_stop_and_wait () { TMUX_OPTS="-L mcserver"
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 $TMUX_OPTS 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";; start|*) tmux $TMUX_OPTS new-window -t $TMUX_SESSION: "./start.sh" || tmux new-session -d -s $TMUX_SESSION "./start.sh";;
esac esac