From bd28300b3e65e6f505e3d8f0a8fb8cfdb9c0aa0a Mon Sep 17 00:00:00 2001 From: Gordian Edenhofer Date: Thu, 9 Jun 2016 23:49:19 +0200 Subject: [PATCH] upgpkg: minecraft-server 1.10-2 Fix false greater than comparison if checking for active players. --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- minecraftd.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3082e4e..2c3c858 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = minecraft-server pkgdesc = Minecraft server unit files, script, and jar pkgver = 1.10 - pkgrel = 1 + pkgrel = 2 url = http://minecraft.net/ install = minecraft-server.install arch = any @@ -29,6 +29,6 @@ pkgbase = minecraft-server md5sums = fef6fadd0739ae03ff71ba61025be207 md5sums = afb84ad0316af0aca421b36eaa2bbd90 md5sums = 00045683c06924d765ac14887218ffcc - md5sums = 7605d5f67e889f6c3743f63ac840ab54 + md5sums = c6d0d66c643aecf25fa5a694c1462cf2 pkgname = minecraft-server diff --git a/PKGBUILD b/PKGBUILD index 7d88a49..de1f858 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=minecraft-server pkgver=1.10 -pkgrel=1 +pkgrel=2 pkgdesc="Minecraft server unit files, script, and jar" arch=('any') url="http://minecraft.net/" @@ -27,7 +27,7 @@ md5sums=('deb46093d99440d249b6065887403ec8' 'fef6fadd0739ae03ff71ba61025be207' 'afb84ad0316af0aca421b36eaa2bbd90' '00045683c06924d765ac14887218ffcc' - '7605d5f67e889f6c3743f63ac840ab54') + 'c6d0d66c643aecf25fa5a694c1462cf2') _game="minecraft" _server_root="/srv/minecraft" diff --git a/minecraftd.sh b/minecraftd.sh index 9503a30..90c1ec5 100755 --- a/minecraftd.sh +++ b/minecraftd.sh @@ -76,7 +76,7 @@ is_player_online() { if [[ -z $(tail -n 1 "${LOGPATH}/latest.log" | sed -r -e 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' -e 's/.*\: //' | tr -d '\n') ]]; then # No player is online return 0; - elif [[ $(tail -n 10 "${LOGPATH}/latest.log" | grep "There are" | sed -r -e '$!d' -e 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' -e 's/.*\: //' -e 's/^([^.]+).*$/\1/; s/^[^0-9]*([0-9]+).*$/\1/' | tr -d '\n') -gt 0 ]]; then + elif [[ $(tail -n 10 "${LOGPATH}/latest.log" | grep "There are" | sed -r -e '$!d' -e 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' -e 's/.*\: //' -e 's/^([^.]+).*$/\1/; s/^[^0-9]*([0-9]+).*$/\1/' | tr -d '\n') -eq 0 ]]; then # No player is online return 0; else