summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2017-01-02 16:09:03 +0100
committerGordian Edenhofer2017-01-02 16:09:03 +0100
commit16218e873211233b76d0d0bc4a938056b5b10222 (patch)
treedd7f1f33e0bfa79bba1c49520788adb369dc1bc2
parentff7ff630e2bb572af45561a5b52590e57b3bb8ad (diff)
downloadaur-16218e873211233b76d0d0bc4a938056b5b10222.tar.gz
upgpkg: minecraft-server 1.11.2-2
Change the idle_server naming schema in the script. Previously screen was used to select a session with a specific well defined name however apparently screen selects anything starting with the specified pattern. This let to some confusion between the server and the idle_server. To circumvent this behaviour simply change the naming schema of the idle_server. THIS IS NOT A FIX! - part 2
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rwxr-xr-xminecraftd.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e9290cb9984..ef5331582ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,6 +29,6 @@ pkgbase = minecraft-server
sha512sums = 19ee3646bfbace353b65c0373594edb654de11c9671f29cebad3b31109f29f94ade1d529d9f409b0989c376bef9b451585b22a1e0ac4295fcc92d9565f808418
sha512sums = b0124c8cd90a4f9901a9105c0ee51eb3e7db944d106cf30fd91b29794178e650d3a21c3be3c8e0cb454b2cef6f27541c44e7a5e77a1d50f89b9152363de51d28
sha512sums = 73132ec613e05c8ed7ebe4eda2395f1ea0733ffe94ba7e203e06246d5852139bbfb7a9073b2b01891282339a2f85676699cd889cde79d6317066e27fd65b1d67
- sha512sums = 503a5555021e42ed15fae8ca32f286142640b7d2c1b2c001d346c1e9010952f1154a3561a3ec7eb8a8736086bf2f15ffaec2c8388aa27332b675b66b9aa7e0c4
+ sha512sums = 09f03cff6cc8f5ca76d564baf28b1998f6b3c010b9f871c238307eb9a61efa895e823d565f6424da38409500dcfe15be3ad4018caa81bea40ad2c9002b326340
pkgname = minecraft-server
diff --git a/PKGBUILD b/PKGBUILD
index a10e22416d6..af5bf632b9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ sha512sums=('f147d99832e2e12f04cc56e28abe33c5acf7d3269631eb3d75aa18108425994d019
'19ee3646bfbace353b65c0373594edb654de11c9671f29cebad3b31109f29f94ade1d529d9f409b0989c376bef9b451585b22a1e0ac4295fcc92d9565f808418'
'b0124c8cd90a4f9901a9105c0ee51eb3e7db944d106cf30fd91b29794178e650d3a21c3be3c8e0cb454b2cef6f27541c44e7a5e77a1d50f89b9152363de51d28'
'73132ec613e05c8ed7ebe4eda2395f1ea0733ffe94ba7e203e06246d5852139bbfb7a9073b2b01891282339a2f85676699cd889cde79d6317066e27fd65b1d67'
- '503a5555021e42ed15fae8ca32f286142640b7d2c1b2c001d346c1e9010952f1154a3561a3ec7eb8a8736086bf2f15ffaec2c8388aa27332b675b66b9aa7e0c4')
+ '09f03cff6cc8f5ca76d564baf28b1998f6b3c010b9f871c238307eb9a61efa895e823d565f6424da38409500dcfe15be3ad4018caa81bea40ad2c9002b326340')
_game="minecraft"
_server_root="/srv/minecraft"
diff --git a/minecraftd.sh b/minecraftd.sh
index 8f65fd41ff3..b5fff42d6bf 100755
--- a/minecraftd.sh
+++ b/minecraftd.sh
@@ -22,7 +22,7 @@ declare -r game="minecraft"
# System parameters for the control script
[[ ! -z "${IDLE_SERVER}" ]] && tmp_IDLE_SERVER=${IDLE_SERVER} || IDLE_SERVER="false"
-[[ ! -z "${IDLE_SESSION_NAME}" ]] && declare -r IDLE_SESSION_NAME=${IDLE_SESSION_NAME} || IDLE_SESSION_NAME="${SESSION_NAME}_idle_server"
+[[ ! -z "${IDLE_SESSION_NAME}" ]] && declare -r IDLE_SESSION_NAME=${IDLE_SESSION_NAME} || IDLE_SESSION_NAME="idle_server_${SESSION_NAME}"
[[ ! -z "${GAME_PORT}" ]] && declare -r GAME_PORT=${GAME_PORT} || GAME_PORT="25565"
[[ ! -z "${CHECK_PLAYER_TIME}" ]] && declare -r CHECK_PLAYER_TIME=${CHECK_PLAYER_TIME} || CHECK_PLAYER_TIME="30"
[[ ! -z "${IDLE_IF_TIME}" ]] && declare -r IDLE_IF_TIME=${IDLE_IF_TIME} || IDLE_IF_TIME="1200"