aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2021-12-10 16:02:56 +0100
committerGordian Edenhofer2021-12-10 16:03:53 +0100
commit264c0d286decc8df1efabb281b330f70ba8616e9 (patch)
treedea3bba5e8bbf3ac363b6d92634994e22fcf42bf
parentc0c93ef6997983fbffce5da0019321b3b7b6e96b (diff)
downloadaur-264c0d286decc8df1efabb281b330f70ba8616e9.tar.gz
upgpkg: minecraft-server 1.18.1-1
Add a small delay to taking backups as for the sever to finish triggering it. upgpkg: cuberite 1.12.2c1_1be14eb-1 upgpkg: cuberite-bin 1.12.2b293-3 upgpkg: spigot 1.18.1+b141-4
-rw-r--r--.SRCINFO14
-rwxr-xr-xPKGBUILD8
-rwxr-xr-xspigot.sh1
3 files changed, 12 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 485ca019ac1f..e9d9942ab71f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = spigot
pkgdesc = High performance Minecraft server implementation
- pkgver = 1.18+b139
+ pkgver = 1.18.1+b141
pkgrel = 4
url = https://www.spigotmc.org/
install = spigot.install
@@ -17,14 +17,14 @@ pkgbase = spigot
depends = sed
optdepends = tar: needed in order to create world backups
optdepends = netcat: required in order to suspend an idle server
- provides = minecraft-server=1.18
- provides = bukkit=1.18
- provides = craftbukkit=1.18
+ provides = minecraft-server=1.18.1
+ provides = bukkit=1.18.1
+ provides = craftbukkit=1.18.1
conflicts = bukkit
conflicts = craftbukkit
conflicts = spigot-patcher
backup = etc/conf.d/spigot
- source = BuildTools-1.18+b139.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/139/artifact/target/BuildTools.jar
+ source = BuildTools-1.18.1+b141.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/141/artifact/target/BuildTools.jar
source = spigot-backup.service
source = spigot-backup.timer
source = spigot.service
@@ -32,13 +32,13 @@ pkgbase = spigot
source = spigot.tmpfiles
source = spigot.conf
source = spigot.sh
- sha512sums = 2cbd1996348495d54b1ef8bd502a814e079bc2e1bbd90699c40f5e042b6c2b6cfee2516f75d8f1589df345c5d78e48d25327ad5238a4816634bdf285b538eeab
+ sha512sums = d4ffaf205dd8565f133c0045e8eee1e6ef3cadaff899fa5c04deada1f9727cd025e41e0dbbfdb20a403406e502d92e20cbe62396e78a5f2a7a738976e51571de
sha512sums = 03ba1032b687553831021cfb0bed489e6301d0446c3b4f56d989d203855952911f3b1caaa00596f4731060ddf6684f66c3d674f3c5546b600cbe6585fc8560fb
sha512sums = 76c77e47c442b477216e968db2213612579b24add54cf0e0512f808498673500b4d24e59bce70b1e7479d724a9a897ceb154e937b88a476beb11c8776258b36c
sha512sums = 5a32439ff4b8fa9db89e9242206cf99109e0b00f29f87711c25342dda522171d999f7e18fb2013437ddf62cfec05b6677601933233aaf42bcb5d67eb7a1469ee
sha512sums = eac1deb53fa9d522af272fa2d9093b98e7d51aa4c0730471e5c575752733500b84a06bc19d1fe83b4c48e41b7f0e11efb23881bfadce4a40d2bfed7cbe5a5bf7
sha512sums = f3b3005a8ee643cb7d8fa24a3d1141604157efd2147d07aa7f839b070370cbed66ccf3c34317181e9601f2aadb5224002617226c99e36b677c0fc3de0b42d0d8
sha512sums = 2f5d71911c9ee7e7763d3300f335245a531a9e00d23e4d007ce76f4175dd7ecd9d8f0425af86a885797764690db64bfa558b49719f3d9d85a46df89443bcdf7b
- sha512sums = c33f1a79ccdb4055a7f34b98895338b772b0f94040c20631e1011ae9c2e727eed2883f957fe686c333ce0465f07b1d15bbd408c2438450ad1c5d12c617273057
+ sha512sums = 49414f963ad4c8ea49c8dcc05c47f2c2df1733eaaef99980b243d7b158c414c90398493dfcd0e3388d103784c3e6a28a63bf39d9a4261b1024ebbb87d9c62e5a
pkgname = spigot
diff --git a/PKGBUILD b/PKGBUILD
index e6ff64407c14..db3a1183c41a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Submitter: Schala Zeal <schalaalexiazeal@gmail.com>
pkgname=spigot
-_pkgver=1.18
-_build=139
+_pkgver=1.18.1
+_build=141
pkgver="${_pkgver}+b${_build}"
pkgrel=4
pkgdesc="High performance Minecraft server implementation"
@@ -26,14 +26,14 @@ source=("BuildTools-${_pkgver}+b${_build}.jar::https://hub.spigotmc.org/jenkins/
"${pkgname}.tmpfiles"
"${pkgname}.conf"
"${pkgname}.sh")
-sha512sums=('2cbd1996348495d54b1ef8bd502a814e079bc2e1bbd90699c40f5e042b6c2b6cfee2516f75d8f1589df345c5d78e48d25327ad5238a4816634bdf285b538eeab'
+sha512sums=('d4ffaf205dd8565f133c0045e8eee1e6ef3cadaff899fa5c04deada1f9727cd025e41e0dbbfdb20a403406e502d92e20cbe62396e78a5f2a7a738976e51571de'
'03ba1032b687553831021cfb0bed489e6301d0446c3b4f56d989d203855952911f3b1caaa00596f4731060ddf6684f66c3d674f3c5546b600cbe6585fc8560fb'
'76c77e47c442b477216e968db2213612579b24add54cf0e0512f808498673500b4d24e59bce70b1e7479d724a9a897ceb154e937b88a476beb11c8776258b36c'
'5a32439ff4b8fa9db89e9242206cf99109e0b00f29f87711c25342dda522171d999f7e18fb2013437ddf62cfec05b6677601933233aaf42bcb5d67eb7a1469ee'
'eac1deb53fa9d522af272fa2d9093b98e7d51aa4c0730471e5c575752733500b84a06bc19d1fe83b4c48e41b7f0e11efb23881bfadce4a40d2bfed7cbe5a5bf7'
'f3b3005a8ee643cb7d8fa24a3d1141604157efd2147d07aa7f839b070370cbed66ccf3c34317181e9601f2aadb5224002617226c99e36b677c0fc3de0b42d0d8'
'2f5d71911c9ee7e7763d3300f335245a531a9e00d23e4d007ce76f4175dd7ecd9d8f0425af86a885797764690db64bfa558b49719f3d9d85a46df89443bcdf7b'
- 'c33f1a79ccdb4055a7f34b98895338b772b0f94040c20631e1011ae9c2e727eed2883f957fe686c333ce0465f07b1d15bbd408c2438450ad1c5d12c617273057')
+ '49414f963ad4c8ea49c8dcc05c47f2c2df1733eaaef99980b243d7b158c414c90398493dfcd0e3388d103784c3e6a28a63bf39d9a4261b1024ebbb87d9c62e5a')
_game="spigot"
_server_root="/srv/craftbukkit"
diff --git a/spigot.sh b/spigot.sh
index e37dd3474d1c..4cd2d1a6d621 100755
--- a/spigot.sh
+++ b/spigot.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