aboutsummarylogtreecommitdiffstats
path: root/minecraftd.sh
diff options
context:
space:
mode:
authorGordian Edenhofer2015-12-14 11:51:31 +0100
committerGordian Edenhofer2015-12-14 11:51:31 +0100
commit2d367a746a4a3119f039d4e299299defcd7dca77 (patch)
tree571d989c58865b2bc318c5837d6ae578564284bb /minecraftd.sh
parent761f7b241868ea62e0c75934e305d6211f97091b (diff)
downloadaur-2d367a746a4a3119f039d4e299299defcd7dca77.tar.gz
Bugfix + Cleaner server_command handling
Fix a bug which was introduced by the new indentation (cat EOF). Tailf which is used to retrieve the server output closes itself as soon as the minecraft command is triggered. Since this functionality is build into tailf there is no need to reinvent the wheel.
Diffstat (limited to 'minecraftd.sh')
-rwxr-xr-x[-rw-r--r--]minecraftd.sh23
1 files changed, 10 insertions, 13 deletions
diff --git a/minecraftd.sh b/minecraftd.sh
index 398e29eb0a8f..ef7dafee02fe 100644..100755
--- a/minecraftd.sh
+++ b/minecraftd.sh
@@ -130,11 +130,8 @@ server_command() {
sudo -u ${MC_USER} screen -S ${SESSION_NAME} -Q select . > /dev/null
if [ $? -eq 0 ]; then
- mc_command "$@"
- tailf -n 0 ${LOGPATH}/latest.log &
- TAILFPID=$! # Process id of tailf command
- sleep 0.1
- kill ${TAILFPID}
+ mc_command "$@" &
+ tailf --pid=$! -n 0 ${LOGPATH}/latest.log &
else
echo "There is no ${SESSION_NAME} session to connect to."
fi
@@ -152,18 +149,18 @@ server_console() {
# Help function, no arguments required
help() {
- cat << 'EOF'
+ cat <<- 'EOF'
This script was design to easily control any minecraft server. Quite every parameter for a given
minecraft server derivative can be altered by editing the variables in the configuration file.
Usage: minecraftd {start|stop|status|backup|command <command>|console}
- start Start the minecraft server
- stop Stop the minecraft server
- restart Restart the minecraft server
- status Print some status information
- backup Backup the world data
- command <command> Run the given comman at the minecraft server console
- console Enter the server console through a screen session
+ start Start the minecraft server
+ stop Stop the minecraft server
+ restart Restart the minecraft server
+ status Print some status information
+ backup Backup the world data
+ command <command> Run the given comman at the minecraft server console
+ console Enter the server console through a screen session
Copyright (c) Gordian Edenhofer <gordian.edenhofer@gmail.com>
EOF