From ccd743fc8a8d0f857bbc9bedf4f05b35522f9093 Mon Sep 17 00:00:00 2001 From: Gordian Edenhofer Date: Mon, 14 Dec 2015 21:32:27 +0100 Subject: [PATCH] Tailf is deprecated, use tail -f instead + Bugfix in tail invocation --- .SRCINFO | 2 +- PKGBUILD | 10 +++++----- minecraftd.sh | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2f7af36..a62f6ea 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -27,7 +27,7 @@ pkgbase = minecraft-server md5sums = c644abdf293c2f98033a64d732a4945c md5sums = 5ed78e366146e47f8498347e93ad5423 md5sums = d4656f27716fd78ab64344a517b07443 - md5sums = 9011b19dc6218d41989835a6bba033e0 + md5sums = 2a54c072bb414eb6a14867efabfc163a pkgname = minecraft-server diff --git a/PKGBUILD b/PKGBUILD index fae0ba7..f007072 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,11 +22,11 @@ source=("https://s3.amazonaws.com/Minecraft.Download/versions/${pkgver}/minecraf "minecraftd.sh") noextract=("minecraft_server.${pkgver}.jar") md5sums=('a0671390aa0691e70a950155aab06ffb' - '2cf6cdf65e0ed6aa6d452943b1e84357' - 'c644abdf293c2f98033a64d732a4945c' - '5ed78e366146e47f8498347e93ad5423' - 'd4656f27716fd78ab64344a517b07443' - '9011b19dc6218d41989835a6bba033e0') + '2cf6cdf65e0ed6aa6d452943b1e84357' + 'c644abdf293c2f98033a64d732a4945c' + '5ed78e366146e47f8498347e93ad5423' + 'd4656f27716fd78ab64344a517b07443' + '2a54c072bb414eb6a14867efabfc163a') package() { install -Dm644 minecraftd.conf "${pkgdir}/etc/conf.d/minecraft" diff --git a/minecraftd.sh b/minecraftd.sh index ef7dafe..5083472 100755 --- a/minecraftd.sh +++ b/minecraftd.sh @@ -130,8 +130,10 @@ server_command() { sudo -u ${MC_USER} screen -S ${SESSION_NAME} -Q select . > /dev/null if [ $? -eq 0 ]; then + sleep 0.1s & + SLEEP_PID=$! mc_command "$@" & - tailf --pid=$! -n 0 ${LOGPATH}/latest.log & + tail -f --pid=${SLEEP_PID} -n 0 ${LOGPATH}/latest.log else echo "There is no ${SESSION_NAME} session to connect to." fi