Upgpkg: 1.9-4

Fix wrong netcat invocation.
Fix faulty systemd unit files with variables in capital letters.
This commit is contained in:
Gordian Edenhofer 2016-03-05 10:08:55 +01:00
parent 04f376ccc9
commit 495689d898
5 changed files with 13 additions and 14 deletions

View File

@ -1,7 +1,7 @@
pkgbase = minecraft-server pkgbase = minecraft-server
pkgdesc = Minecraft server unit files, script, and jar pkgdesc = Minecraft server unit files, script, and jar
pkgver = 1.9 pkgver = 1.9
pkgrel = 3 pkgrel = 4
url = http://minecraft.net/ url = http://minecraft.net/
install = minecraft-server.install install = minecraft-server.install
arch = any arch = any
@ -24,10 +24,10 @@ pkgbase = minecraft-server
source = minecraftd.conf source = minecraftd.conf
source = minecraftd.sh source = minecraftd.sh
md5sums = ff68834eee875bcf367422c67673207c md5sums = ff68834eee875bcf367422c67673207c
md5sums = 09e94951d2c2fcf5afab890cdd51dacb md5sums = b786935d6517d46fe0944377daba32b8
md5sums = fef6fadd0739ae03ff71ba61025be207 md5sums = fef6fadd0739ae03ff71ba61025be207
md5sums = 53f7e807bd53f32be2f0c6c06b249f63 md5sums = afb84ad0316af0aca421b36eaa2bbd90
md5sums = 54438e0c47cc5083e0a4376688b46092 md5sums = 54438e0c47cc5083e0a4376688b46092
md5sums = 4f11b1efd6941ea894ca0497824201cf md5sums = f0916bc22215b5dfabb5566e4850bcb8
pkgname = minecraft-server pkgname = minecraft-server

View File

@ -4,7 +4,7 @@
pkgname=minecraft-server pkgname=minecraft-server
pkgver=1.9 pkgver=1.9
pkgrel=3 pkgrel=4
pkgdesc="Minecraft server unit files, script, and jar" pkgdesc="Minecraft server unit files, script, and jar"
arch=('any') arch=('any')
url="http://minecraft.net/" url="http://minecraft.net/"
@ -24,11 +24,11 @@ source=("https://s3.amazonaws.com/Minecraft.Download/versions/${pkgver}/minecraf
"minecraftd.sh") "minecraftd.sh")
noextract=("minecraft_server.${pkgver}.jar") noextract=("minecraft_server.${pkgver}.jar")
md5sums=('ff68834eee875bcf367422c67673207c' md5sums=('ff68834eee875bcf367422c67673207c'
'09e94951d2c2fcf5afab890cdd51dacb' 'b786935d6517d46fe0944377daba32b8'
'fef6fadd0739ae03ff71ba61025be207' 'fef6fadd0739ae03ff71ba61025be207'
'53f7e807bd53f32be2f0c6c06b249f63' 'afb84ad0316af0aca421b36eaa2bbd90'
'54438e0c47cc5083e0a4376688b46092' '54438e0c47cc5083e0a4376688b46092'
'4f11b1efd6941ea894ca0497824201cf') 'f0916bc22215b5dfabb5566e4850bcb8')
_game="minecraft" _game="minecraft"
_server_root="/srv/minecraft" _server_root="/srv/minecraft"

View File

@ -4,10 +4,9 @@ After=local-fs.target
[Service] [Service]
Type=forking Type=forking
EnvironmentFile=/etc/conf.d/minecraft
ExecStart=/usr/bin/minecraftd backup ExecStart=/usr/bin/minecraftd backup
USER=minecraft User=minecraft
GROUP=minecraft Group=minecraft
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -6,8 +6,8 @@ After=local-fs.target network.target
Type=forking Type=forking
ExecStart=/usr/bin/minecraftd start ExecStart=/usr/bin/minecraftd start
ExecStop=/usr/bin/minecraftd stop ExecStop=/usr/bin/minecraftd stop
USER=minecraft User=minecraft
GROUP=minecraft Group=minecraft
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -93,7 +93,7 @@ idle_server_daemon() {
else else
# Game server is down, listen on port ${GAME_PORT} for incoming connections # Game server is down, listen on port ${GAME_PORT} for incoming connections
echo "Netcat is listening on port ${GAME_PORT} for incoming connections..." echo "Netcat is listening on port ${GAME_PORT} for incoming connections..."
${NETCAT_CMD} -v -l ${GAME_PORT} ${NETCAT_CMD} -v -l -p ${GAME_PORT}
echo "Netcat caught an connection. The server is coming up again...." echo "Netcat caught an connection. The server is coming up again...."
IDLE_SERVER="false" ${myname} start IDLE_SERVER="false" ${myname} start
sleep ${CHECK_PLAYER_TIME} sleep ${CHECK_PLAYER_TIME}