aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD10
-rwxr-xr-xpapermc.sh1
3 files changed, 13 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4d0f03618689..8cb6d5f93cf0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = papermc
pkgdesc = Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance
- pkgver = 1.18+b18
+ pkgver = 1.18+b65
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.18+b18.jar
+ noextract = papermc.1.18+b65.jar
backup = etc/conf.d/papermc
- source = papermc.1.18+b18.jar::https://papermc.io/api/v2/projects/paper/versions/1.18/builds/18/downloads/paper-1.18-18.jar
+ source = papermc.1.18+b65.jar::https://papermc.io/api/v2/projects/paper/versions/1.18/builds/65/downloads/paper-1.18-65.jar
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.18+b18.md::https://raw.githubusercontent.com/PaperMC/Paper/f25facb/LICENSE.md
- sha512sums = e9ce5b5c510bd8c20f09559dfe807e44ffe67e6caa2961d21e9ed004835516c440ebac88bd020b4cced6726b2cf28e63448735aa9cd529579cdc1eaafec5c68a
+ source = LICENSE_1.18+b65.md::https://raw.githubusercontent.com/PaperMC/Paper/e955cb5/LICENSE.md
+ sha512sums = 15eb039bf9aa23e04e2cb8722aeb50bf95de645acc39caf16ca9684bed6a399f73c4c400e3afb34ad7e9bb26a54360394799b24de15a7fa16024e11dc8bc81cc
sha512sums = a4fcc9f28436c0163e9414f2793fcbd4f6ea74772230cdff4a628246eae2a8008688b3dfb94d433f8f0887cd7eea3fe43ce25f9d5812d46e62179ff315b62895
sha512sums = 51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42
sha512sums = f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456
sha512sums = fe268d7380f881229100700b1d4f4897904a630aa65b0b06bba08be5d5918f208d497e01fc5306deecd5d93a78cfdb7e9c7f1c3b910b3a414ce9af186a05224d
- sha512sums = 56c32b28ad6b3363e5de65860752457c780a1028314371319898b9896e3baec2bf662c64c59ea10a8efaf2273d014b5dfbd9c7bb66c6787de4b35e9341ca2582
+ sha512sums = 236eefc067a3d5172d164b3d4ee9d3735f7d399d11172a5b24b175395526c5a11db65d647039149717d216219365962e0d89022073afa8ffa09ea0f84d08b1d9
sha512sums = c40cba5dfbf5af5d206cd42fa2b43f2321b481f83ab79c9ce4eaa76f204abab48ff2d8b8526a1a3d82636be97f18596d4343b0efc72a7082642e4af8d1b561c5
sha512sums = 115fe7213d7edd0e3159607a31b28edb6e6b3bd1d454d516973e38c8cf0b803275c2c4e59b29e2260561270d931c71bad134046535e5add309e0a8d055cde0ff
- sha512sums = 3caa140e6545b7d61a182874cf5578050ad3f74c7e95fc5643b8c7594672bbbd9161381aa9c93b51248e12e60c6411d47fbb426ce3c22389bc8161c17278382e
+ sha512sums = b46b8ef9b837ac7cb3cded4ba2c4b5215e92ab27fcd889766a6fa3238e76a8b9ba8eb608b136648af5c08e4ef80c21570d6ac2868e4ef6c46521c387c1f7e519
pkgname = papermc
diff --git a/PKGBUILD b/PKGBUILD
index 174090b3bf39..dfe451a3b44c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@ pkgname=papermc
# curl -X GET "https://papermc.io/api/v2/projects/paper" -H "accept: application/json"
_pkgver=1.18
# curl -X GET "https://papermc.io/api/v2/projects/paper/versions/${_pkgver}" -H "accept: application/json"
-_build=18
-_license_commit=f25facb
+_build=65
+_license_commit=e955cb5
pkgver="${_pkgver}+b${_build}"
pkgrel=1
pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
@@ -28,15 +28,15 @@ source=("papermc.${pkgver}.jar"::"https://papermc.io/api/v2/projects/paper/versi
"papermc.sysusers"
"LICENSE_${pkgver}.md"::"https://raw.githubusercontent.com/PaperMC/Paper/${_license_commit}/LICENSE.md")
noextract=("papermc.${pkgver}.jar")
-sha512sums=('e9ce5b5c510bd8c20f09559dfe807e44ffe67e6caa2961d21e9ed004835516c440ebac88bd020b4cced6726b2cf28e63448735aa9cd529579cdc1eaafec5c68a'
+sha512sums=('15eb039bf9aa23e04e2cb8722aeb50bf95de645acc39caf16ca9684bed6a399f73c4c400e3afb34ad7e9bb26a54360394799b24de15a7fa16024e11dc8bc81cc'
'a4fcc9f28436c0163e9414f2793fcbd4f6ea74772230cdff4a628246eae2a8008688b3dfb94d433f8f0887cd7eea3fe43ce25f9d5812d46e62179ff315b62895'
'51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42'
'f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456'
'fe268d7380f881229100700b1d4f4897904a630aa65b0b06bba08be5d5918f208d497e01fc5306deecd5d93a78cfdb7e9c7f1c3b910b3a414ce9af186a05224d'
- '56c32b28ad6b3363e5de65860752457c780a1028314371319898b9896e3baec2bf662c64c59ea10a8efaf2273d014b5dfbd9c7bb66c6787de4b35e9341ca2582'
+ '236eefc067a3d5172d164b3d4ee9d3735f7d399d11172a5b24b175395526c5a11db65d647039149717d216219365962e0d89022073afa8ffa09ea0f84d08b1d9'
'c40cba5dfbf5af5d206cd42fa2b43f2321b481f83ab79c9ce4eaa76f204abab48ff2d8b8526a1a3d82636be97f18596d4343b0efc72a7082642e4af8d1b561c5'
'115fe7213d7edd0e3159607a31b28edb6e6b3bd1d454d516973e38c8cf0b803275c2c4e59b29e2260561270d931c71bad134046535e5add309e0a8d055cde0ff'
- '3caa140e6545b7d61a182874cf5578050ad3f74c7e95fc5643b8c7594672bbbd9161381aa9c93b51248e12e60c6411d47fbb426ce3c22389bc8161c17278382e')
+ 'b46b8ef9b837ac7cb3cded4ba2c4b5215e92ab27fcd889766a6fa3238e76a8b9ba8eb608b136648af5c08e4ef80c21570d6ac2868e4ef6c46521c387c1f7e519')
_game="papermc"
_server_root="/srv/papermc"
diff --git a/papermc.sh b/papermc.sh
index db2ee09f912c..703e8680cd7e 100755
--- a/papermc.sh
+++ b/papermc.sh
@@ -344,6 +344,7 @@ backup_files() {
if socket_has_session "${SESSION_NAME}"; then
game_command save-off
game_command save-all
+ sleep "${sleep_time:-0.3}"
sync && wait
${SUDO_CMD} tar -C "${SERVER_ROOT}" -cf "${BACKUP_DEST}/${fname}" ${BACKUP_PATHS} --totals ${BACKUP_FLAGS} 2>&1 | grep -v "tar: Removing leading "
game_command save-on