upgpkg: minecraft-server 1.12-4

Fix a bug which prohibited deleting more than one old backup at a time
due to confusing spaces with new lines.

upgpkg: spigot 1.12-2

3 files changed, 7 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0954a74e181..73d340dc00c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = minecraft-server
 	pkgdesc = Minecraft server unit files, script, and jar
 	pkgver = 1.12
-	pkgrel = 3
+	pkgrel = 4
 	url = https://minecraft.net/
 	install = minecraft-server.install
 	arch = any
@@ -29,6 +29,6 @@ pkgbase = minecraft-server
 	sha512sums = 19ee3646bfbace353b65c0373594edb654de11c9671f29cebad3b31109f29f94ade1d529d9f409b0989c376bef9b451585b22a1e0ac4295fcc92d9565f808418
 	sha512sums = b0124c8cd90a4f9901a9105c0ee51eb3e7db944d106cf30fd91b29794178e650d3a21c3be3c8e0cb454b2cef6f27541c44e7a5e77a1d50f89b9152363de51d28
 	sha512sums = 73132ec613e05c8ed7ebe4eda2395f1ea0733ffe94ba7e203e06246d5852139bbfb7a9073b2b01891282339a2f85676699cd889cde79d6317066e27fd65b1d67
-	sha512sums = d92a1c0babd25a1811e643222bcb0f96b65b936a132bfe5ba308397abc81369e819dbb6f29293ee23088d70a2e439edcd974f0a60676fa019a57b20be68e587f
+	sha512sums = b83b93a25d312825363eb85dec4b04379e9a3b2caf9faaf6f4958966900ecd2d2d5d8c5ecc25fca711da1dbf162129720bed419492ef8bf9dbb1649a5bdb1656
 
 pkgname = minecraft-server
diff --git a/PKGBUILD b/PKGBUILD
index 803cad4bacfc..1eadcbc442b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=minecraft-server
 pkgver=1.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Minecraft server unit files, script, and jar"
 arch=('any')
 url="https://minecraft.net/"
@@ -27,7 +27,7 @@ sha512sums=('b96aff9b718373c587ada412513aa3c8111c88ff1424a9ec9f80a934e781a4371bf
             '19ee3646bfbace353b65c0373594edb654de11c9671f29cebad3b31109f29f94ade1d529d9f409b0989c376bef9b451585b22a1e0ac4295fcc92d9565f808418'
             'b0124c8cd90a4f9901a9105c0ee51eb3e7db944d106cf30fd91b29794178e650d3a21c3be3c8e0cb454b2cef6f27541c44e7a5e77a1d50f89b9152363de51d28'
             '73132ec613e05c8ed7ebe4eda2395f1ea0733ffe94ba7e203e06246d5852139bbfb7a9073b2b01891282339a2f85676699cd889cde79d6317066e27fd65b1d67'
-            'd92a1c0babd25a1811e643222bcb0f96b65b936a132bfe5ba308397abc81369e819dbb6f29293ee23088d70a2e439edcd974f0a60676fa019a57b20be68e587f')
+            'b83b93a25d312825363eb85dec4b04379e9a3b2caf9faaf6f4958966900ecd2d2d5d8c5ecc25fca711da1dbf162129720bed419492ef8bf9dbb1649a5bdb1656')
 
 _game="minecraft"
 _server_root="/srv/minecraft"
diff --git a/minecraftd.sh b/minecraftd.sh
index 6a4203b5422a..521ac2cde882 100755
--- a/minecraftd.sh
+++ b/minecraftd.sh
@@ -315,7 +315,9 @@ backup_files() {
 	echo -n "Only keeping the last ${KEEP_BACKUPS} backups and removing the other ones..."
 	BACKUP_COUNT=$(for f in "${BACKUP_DEST}"/[0-9_.]*; do echo "${f}"; done | wc -l)
 	if [[ $(( BACKUP_COUNT - KEEP_BACKUPS )) -gt 0 ]]; then
-		${SUDO_CMD} rm "$(for f in "${BACKUP_DEST}"/[0-9_.]*; do echo "${f}"; done | head -n"$(( BACKUP_COUNT - KEEP_BACKUPS ))")"
+		for old_backup in $(for f in "${BACKUP_DEST}"/[0-9_.]*; do echo "${f}"; done | head -n"$(( BACKUP_COUNT - KEEP_BACKUPS ))"); do
+			${SUDO_CMD} rm "${old_backup}";
+		done
 		echo -e "\e[39;1m done\e[0m ($(( BACKUP_COUNT - KEEP_BACKUPS)) backup(s) pruned)"
 	else
 		echo -e "\e[39;1m done\e[0m (no backups pruned)"