diff options
author | Gordian Edenhofer | 2016-03-02 21:47:37 +0100 |
---|---|---|
committer | Gordian Edenhofer | 2016-03-02 21:51:54 +0100 |
commit | 89684ebd701dd611698c33e4b286ce06207b90f7 (patch) | |
tree | fb85f5835bc84d5f6a0abe363bc0a59aae150b4f | |
parent | e331e1e8c25c5fce0a01da2ba8ef9273484ac8f8 (diff) | |
download | aur-89684ebd701dd611698c33e4b286ce06207b90f7.tar.gz |
Upgpkg: 1.9-2
Fix serious problem which let to the idle_server_daemon being started
independently from whether the user actually wanting it.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rwxr-xr-x | minecraftd.sh | 5 |
3 files changed, 6 insertions, 5 deletions
@@ -28,6 +28,6 @@ pkgbase = minecraft-server md5sums = fef6fadd0739ae03ff71ba61025be207 md5sums = cab358c32dd0d4d2463e60ee2996f658 md5sums = 54438e0c47cc5083e0a4376688b46092 - md5sums = aa1603e6c4090bfcf3177cb59b15bae8 + md5sums = 4f11b1efd6941ea894ca0497824201cf pkgname = minecraft-server @@ -4,7 +4,7 @@ pkgname=minecraft-server pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="Minecraft server unit files, script, and jar" arch=('any') url="http://minecraft.net/" @@ -28,7 +28,7 @@ md5sums=('ff68834eee875bcf367422c67673207c' 'fef6fadd0739ae03ff71ba61025be207' 'cab358c32dd0d4d2463e60ee2996f658' '54438e0c47cc5083e0a4376688b46092' - 'aa1603e6c4090bfcf3177cb59b15bae8') + '4f11b1efd6941ea894ca0497824201cf') _game="minecraft" _server_root="/srv/minecraft" diff --git a/minecraftd.sh b/minecraftd.sh index e594bca23274..23669263c363 100755 --- a/minecraftd.sh +++ b/minecraftd.sh @@ -131,12 +131,13 @@ server_start() { fi else # Though IDLE_SERVER is not set to true it could still be running and just have not noticed that the - # server was started, e.g. by manually triggering server_start again. Therefore reset the idle daemon. + # server was started, e.g. by manually triggering server_start again. Reset the idle daemon in this case. ${SUDO_CMD} screen -S "${IDLE_SESSION_NAME}" -Q select . > /dev/null if [[ $? -eq 0 ]]; then ${SUDO_CMD} screen -S "${IDLE_SESSION_NAME}" -X quit + sleep 0.1 + ${SUDO_CMD} screen -dmS "${IDLE_SESSION_NAME}" /bin/bash -c "${myname} idle_server_daemon" fi - ${SUDO_CMD} screen -dmS "${IDLE_SESSION_NAME}" /bin/bash -c "${myname} idle_server_daemon" fi } |