diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rwxr-xr-x | papermc.sh | 6 |
3 files changed, 16 insertions, 14 deletions
@@ -1,6 +1,6 @@ pkgbase = papermc pkgdesc = Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance - pkgver = 1.16.5+b662 + pkgver = 1.16.5+b778 pkgrel = 1 url = https://papermc.io/ install = papermc.install @@ -15,9 +15,9 @@ pkgbase = papermc optdepends = tar: needed in order to create world backups optdepends = netcat: required in order to suspend an idle server conflicts = papermc-git - noextract = papermc.1.16.5+b662.jar + noextract = papermc.1.16.5+b778.jar backup = etc/conf.d/papermc - source = papermc.1.16.5+b662.jar::https://papermc.io/api/v1/paper/1.16.5/662/download + source = papermc.1.16.5+b778.jar::https://papermc.io/api/v1/paper/1.16.5/778/download source = papermc-backup.service source = papermc-backup.timer source = papermc.service @@ -25,15 +25,15 @@ pkgbase = papermc source = papermc.sh source = papermc.tmpfiles source = papermc.sysusers - source = LICENSE_1.16.5+b662.md::https://raw.githubusercontent.com/PaperMC/Paper/4a7962c/LICENSE.md - sha512sums = ac3ff826442f8f35a16d7fe198dd67a51452be5566081d00556a9b2afff5a56037738780469654f85d25c58dc41a98b126ba361c673aed46587546844195ae1e + source = LICENSE_1.16.5+b778.md::https://raw.githubusercontent.com/PaperMC/Paper/b7976b9/LICENSE.md + sha512sums = 0f402d0a8ae0c733ac115708296b480eb63b9dd9d6c690ca2146ceb6dcca5e2c13d55560de1aa23ae28bafe15447777e87d7e5ea77b621c758d90129463279f7 sha512sums = a4fcc9f28436c0163e9414f2793fcbd4f6ea74772230cdff4a628246eae2a8008688b3dfb94d433f8f0887cd7eea3fe43ce25f9d5812d46e62179ff315b62895 sha512sums = 51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42 sha512sums = f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456 sha512sums = fe268d7380f881229100700b1d4f4897904a630aa65b0b06bba08be5d5918f208d497e01fc5306deecd5d93a78cfdb7e9c7f1c3b910b3a414ce9af186a05224d - sha512sums = 3095ccd94c1918b71ee267dc7d0a429276d732422d660f3162ad5cb16c675cebfc4c12d9acfb7852b4245590b61517bd151b93aac24fddb4ebb3ef23f812d3c5 + sha512sums = 1982a9628e775a6ffad7c72718378d9b84b70e932a9adc0cf5fd467bfba033b62ef77a9c5f41b6d7062fcf2ab6044d4a248e31191b8e00c5e76ef6fc36eb5053 sha512sums = c40cba5dfbf5af5d206cd42fa2b43f2321b481f83ab79c9ce4eaa76f204abab48ff2d8b8526a1a3d82636be97f18596d4343b0efc72a7082642e4af8d1b561c5 sha512sums = 115fe7213d7edd0e3159607a31b28edb6e6b3bd1d454d516973e38c8cf0b803275c2c4e59b29e2260561270d931c71bad134046535e5add309e0a8d055cde0ff - sha512sums = d4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5 + sha512sums = 9b60b6b3655edff4782f713eeef0cd02879ca18f545f757346e07f5a693948d5ab60dc9c74ad7a94f8bea09dda90993d4b501fd98d98b4f7ef1d5dfaf40e2f16 pkgname = papermc @@ -2,8 +2,8 @@ pkgname=papermc _pkgver=1.16.5 -_build=662 -_license_commit=4a7962c +_build=778 +_license_commit=b7976b9 pkgver="${_pkgver}+b${_build}" pkgrel=1 pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance" @@ -26,15 +26,15 @@ source=("papermc.${pkgver}.jar"::"https://papermc.io/api/v1/paper/${_pkgver}/${_ "papermc.sysusers" "LICENSE_${pkgver}.md"::"https://raw.githubusercontent.com/PaperMC/Paper/${_license_commit}/LICENSE.md") noextract=("papermc.${pkgver}.jar") -sha512sums=('ac3ff826442f8f35a16d7fe198dd67a51452be5566081d00556a9b2afff5a56037738780469654f85d25c58dc41a98b126ba361c673aed46587546844195ae1e' +sha512sums=('0f402d0a8ae0c733ac115708296b480eb63b9dd9d6c690ca2146ceb6dcca5e2c13d55560de1aa23ae28bafe15447777e87d7e5ea77b621c758d90129463279f7' 'a4fcc9f28436c0163e9414f2793fcbd4f6ea74772230cdff4a628246eae2a8008688b3dfb94d433f8f0887cd7eea3fe43ce25f9d5812d46e62179ff315b62895' '51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42' 'f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456' 'fe268d7380f881229100700b1d4f4897904a630aa65b0b06bba08be5d5918f208d497e01fc5306deecd5d93a78cfdb7e9c7f1c3b910b3a414ce9af186a05224d' - '3095ccd94c1918b71ee267dc7d0a429276d732422d660f3162ad5cb16c675cebfc4c12d9acfb7852b4245590b61517bd151b93aac24fddb4ebb3ef23f812d3c5' + '1982a9628e775a6ffad7c72718378d9b84b70e932a9adc0cf5fd467bfba033b62ef77a9c5f41b6d7062fcf2ab6044d4a248e31191b8e00c5e76ef6fc36eb5053' 'c40cba5dfbf5af5d206cd42fa2b43f2321b481f83ab79c9ce4eaa76f204abab48ff2d8b8526a1a3d82636be97f18596d4343b0efc72a7082642e4af8d1b561c5' '115fe7213d7edd0e3159607a31b28edb6e6b3bd1d454d516973e38c8cf0b803275c2c4e59b29e2260561270d931c71bad134046535e5add309e0a8d055cde0ff' - 'd4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5') + '9b60b6b3655edff4782f713eeef0cd02879ca18f545f757346e07f5a693948d5ab60dc9c74ad7a94f8bea09dda90993d4b501fd98d98b4f7ef1d5dfaf40e2f16') _game="papermc" _server_root="/srv/papermc" diff --git a/papermc.sh b/papermc.sh index f62aa2702d95..e4e7ed485025 100755 --- a/papermc.sh +++ b/papermc.sh @@ -140,7 +140,8 @@ idle_server_daemon() { no_player=$(( IDLE_IF_TIME - 300 )) # Game server is down, listen on port ${GAME_PORT} for incoming connections echo -n "Netcat: " - ${NETCAT_CMD} -v -l -p ${GAME_PORT} && echo "Netcat caught an connection. The server is coming up again..." + ${NETCAT_CMD} -v -l -p ${GAME_PORT} 2>&1 | (grep -m1 -i "connect" && pkill -P $$ ${NETCAT_CMD}) || true + echo "Netcat caught a connection. The server is coming up again..." IDLE_SERVER="false" ${myname} start fi else @@ -152,7 +153,8 @@ idle_server_daemon() { no_player=$(( IDLE_IF_TIME - 300 )) # Game server is down, listen on port ${GAME_PORT} for incoming connections echo -n "Netcat: " - ${NETCAT_CMD} -v -l -p ${GAME_PORT} && echo "Netcat caught an connection. The server is coming up again..." + ${NETCAT_CMD} -v -l -p ${GAME_PORT} 2>&1 | (grep -m1 -i "connect" && pkill -P $$ ${NETCAT_CMD}) || true + echo "Netcat caught a connection. The server is coming up again..." IDLE_SERVER="false" ${myname} start fi done |