Upgrade: 1.6.4_9.11.1.1345-6

Nitroretro: Sync with minecraft-server 1edad4acae56cb81b102d77251542a78a344b4bb

> Author: Gordian Edenhofer <gordian.edenhofer@gmail.com>
> Date:   Tue Jan 14 20:34:55 2020 +0100
>
> upgpkg: minecraft-server 1.15.1-2
>
> Introduce a new config flag called `BACKUP_FLAGS` for specifying
> additional flags which to pass to tar for compression.
>
> Additionally, replace `Type=forking` with `Type=oneshot` in the backup
> services as to not let the backup timeout.
>
> Furthermore, change some upper case variables to lower case ones.
>
> upgpkg: spigot 1.15.1+b107-1
> upgpkg: cuberite 1.12b1065-1
> upgpkg: papermc 1.15.1+b48-1

5 files changed, 23 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 174c8273310c..93b1fce316b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = forge-server-1.6.4
 	pkgdesc = Minecraft Forge server unit files, script and jar
 	pkgver = 1.6.4_9.11.1.1345
-	pkgrel = 5
+	pkgrel = 6
 	url = https://minecraftforge.net
 	install = forge-server.install
 	arch = any
@@ -27,11 +27,11 @@ pkgbase = forge-server-1.6.4
 	source = Paulscode%20IBXM%20Library%20License-forge-server-1.6.4-1.6.4-9.11.1.1345.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.6/install/Paulscode%20IBXM%20Library%20License.txt
 	source = Paulscode%20SoundSystem%20CodecIBXM%20License-forge-server-1.6.4-1.6.4-9.11.1.1345.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.6/install/Paulscode%20SoundSystem%20CodecIBXM%20License.txt
 	source = LICENSE-fml-forge-server-1.6.4-1.6.4-9.11.1.1345.txt::https://raw.githubusercontent.com/MinecraftForge/FML/902772ed0cb6c22c4cd7ad9b0ec7a02961b5e016/LICENSE-fml.txt
-	sha512sums = 9b862f6a0d81910185343ffd86a5a92aaf896fa2cddb4accd3dabcf79f6a27380f5d72af8d1a7f4d9ba92c4c6149782a150c4a34bf26346220a72e420cb6616c
+	sha512sums = 7ec9917d4545e96541d26a8c6ab4506d9354abc7e80102df6b31a94c1d27a84ad7f546e98ec729ac6e82c1f92232db792a7e3e1bde6338b3f8142b5e9cf93872
 	sha512sums = 7354cbf22ff7326fbcd74079b8ec672afbf96ad8e5e638da16589a1262f0f383f5154a9cd1e2397f3bc9c617373098f1f8247f8ab9ffe104509a1ffd9f4e829d
 	sha512sums = 553e024ecf8d22e13724ab08846e3ec6009ea2fc37584c12e98cf009af19ba937ddfa0fe59585a0fccde2f95193871702f844f4b75bb378749d114d79eeaea29
-	sha512sums = 7ed8519ddc9e414ccdf07d3081c5cbe1e19639db92df9f106c6e598d2322405319ccc3acb06287546822f2bf677009f92fe2e246db9cf1b056bdb25651be8d08
-	sha512sums = 9191fbe9c313321a3b9e392d5ef44518af422ae0d7fc4f3ef34d30e1486da5403f2ac8682dc21c5f944b7d4598f899ed898f1e1d298501b4966997dcacf307b6
+	sha512sums = 9486c5138b4951d3b43ebbdc5c92cee4643edbea54f527b90c15568002cf4968eb06d6c0c0f19a4ffa80cf90cba80491eaecea431595d1c5586edc150a9e1630
+	sha512sums = daa68d6ffed89da01c04313d61cc8c5ba6a6e07c390b43148759b4cc5169cebef9fc4414c61efcdefbe603cf3ee679cebec894550337a0d7b132af54b7e42678
 	sha512sums = 2dd01e05097ada099f8c9e9477f6c7aaee6e472c9ca3d7f52677dc6595ee49191d63a1d0f46ed103ef4def92fb80cbab7bee5929bfe4ef67060c4d69cf6da107
 	sha512sums = 87d06b528a14ed2e67adcd022d1236a426e3e6a73a45663b3d22ffe7bc05d6026dad2772b2e90056a479eae3e20a9a379a61c31aac6369d4f93474a168b9a292
 	sha512sums = 7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3
diff --git a/PKGBUILD b/PKGBUILD
index 05f47bcdb516..e2b5475c4b3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 ## Contributor: Philip Abernethy <chais.z3r0@gmail.com>
 ## Contributor: sowieso <sowieso@dukun.de>
 
-_ver="1.6.4_9.11.1.1345-5"
+_ver="1.6.4_9.11.1.1345-6"
 _minecraft_ver_latest="1.14.4"
 
 IFS="-" read -ra _ver_temp <<< "$_ver"
@@ -45,11 +45,11 @@ source=("forged-backup.service"
 	"forged.conf"
 	"forged.sh")
 noextract=("forge-${_pkgver}.jar")
-sha512sums=('9b862f6a0d81910185343ffd86a5a92aaf896fa2cddb4accd3dabcf79f6a27380f5d72af8d1a7f4d9ba92c4c6149782a150c4a34bf26346220a72e420cb6616c'
+sha512sums=('7ec9917d4545e96541d26a8c6ab4506d9354abc7e80102df6b31a94c1d27a84ad7f546e98ec729ac6e82c1f92232db792a7e3e1bde6338b3f8142b5e9cf93872'
             '7354cbf22ff7326fbcd74079b8ec672afbf96ad8e5e638da16589a1262f0f383f5154a9cd1e2397f3bc9c617373098f1f8247f8ab9ffe104509a1ffd9f4e829d'
             '553e024ecf8d22e13724ab08846e3ec6009ea2fc37584c12e98cf009af19ba937ddfa0fe59585a0fccde2f95193871702f844f4b75bb378749d114d79eeaea29'
-            '7ed8519ddc9e414ccdf07d3081c5cbe1e19639db92df9f106c6e598d2322405319ccc3acb06287546822f2bf677009f92fe2e246db9cf1b056bdb25651be8d08'
-            '9191fbe9c313321a3b9e392d5ef44518af422ae0d7fc4f3ef34d30e1486da5403f2ac8682dc21c5f944b7d4598f899ed898f1e1d298501b4966997dcacf307b6'
+            '9486c5138b4951d3b43ebbdc5c92cee4643edbea54f527b90c15568002cf4968eb06d6c0c0f19a4ffa80cf90cba80491eaecea431595d1c5586edc150a9e1630'
+            'daa68d6ffed89da01c04313d61cc8c5ba6a6e07c390b43148759b4cc5169cebef9fc4414c61efcdefbe603cf3ee679cebec894550337a0d7b132af54b7e42678'
             '2dd01e05097ada099f8c9e9477f6c7aaee6e472c9ca3d7f52677dc6595ee49191d63a1d0f46ed103ef4def92fb80cbab7bee5929bfe4ef67060c4d69cf6da107'
             '87d06b528a14ed2e67adcd022d1236a426e3e6a73a45663b3d22ffe7bc05d6026dad2772b2e90056a479eae3e20a9a379a61c31aac6369d4f93474a168b9a292'
             '7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3'
diff --git a/forged-backup.service b/forged-backup.service
index d01255098fb9..79edc9bcf245 100644
--- a/forged-backup.service
+++ b/forged-backup.service
@@ -3,7 +3,7 @@ Description=Minecraft Forge 1.6.4 Server World Backup
 After=local-fs.target
 
 [Service]
-Type=forking
+Type=simple
 ExecStart=/usr/bin/forge-1.6.4d backup
 User=forge-1-6-4
 Group=forge-1-6-4
diff --git a/forged.conf b/forged.conf
index 0594f2bf9f37..28a6c59573f2 100644
--- a/forged.conf
+++ b/forged.conf
@@ -5,6 +5,7 @@
 SERVER_ROOT="/srv/forge-1.6.4"
 BACKUP_DEST="/srv/forge-1.6.4/backup"
 BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT
+BACKUP_FLAGS="-z"
 KEEP_BACKUPS="10"
 GAME_USER="forge-1-6-4"
 MAIN_EXECUTABLE="forge.jar"
diff --git a/forged.sh b/forged.sh
index 91c541336285..5d9c27959d3e 100755
--- a/forged.sh
+++ b/forged.sh
@@ -12,6 +12,7 @@ declare -r game="forge-1.6.4"
 [[ -n "${SERVER_ROOT}" ]]  && declare -r SERVER_ROOT=${SERVER_ROOT}   || SERVER_ROOT="/srv/${game}"
 [[ -n "${BACKUP_DEST}" ]]  && declare -r BACKUP_DEST=${BACKUP_DEST}   || BACKUP_DEST="/srv/${game}/backup"
 [[ -n "${BACKUP_PATHS}" ]] && declare -r BACKUP_PATHS=${BACKUP_PATHS} || BACKUP_PATHS="world"
+[[ -n "${BACKUP_FLAGS}" ]] && declare -r BACKUP_FLAGS=${BACKUP_FLAGS} || BACKUP_FLAGS="-z"
 [[ -n "${KEEP_BACKUPS}" ]] && declare -r KEEP_BACKUPS=${KEEP_BACKUPS} || KEEP_BACKUPS="10"
 [[ -n "${GAME_USER}" ]]    && declare -r GAME_USER=${GAME_USER}       || GAME_USER="forge-1-6-4"
 [[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge.jar"
@@ -30,7 +31,6 @@ declare -r game="forge-1.6.4"
 # Additional configuration options which only few may need to alter
 [[ -n "${GAME_COMMAND_DUMP}" ]] && declare -r GAME_COMMAND_DUMP=${GAME_COMMAND_DUMP} || GAME_COMMAND_DUMP="/tmp/${myname}_${SESSION_NAME}_command_dump.txt"
 
-# shellcheck source=forged.conf
 # Variables passed over the command line will always override the one from a config file
 source /etc/conf.d/"${game}" 2>/dev/null || >&2 echo "Could not source /etc/conf.d/${game}"
 
@@ -302,26 +302,26 @@ backup_files() {
 	fi
 
 	echo "Starting backup..."
-	FILE="$(date +%Y_%m_%d_%H.%M.%S).tar.gz"
+	fname="$(date +%Y_%m_%d_%H.%M.%S).tar.gz"
 	${SUDO_CMD} mkdir -p "${BACKUP_DEST}"
 	if ${SUDO_CMD} screen -S "${SESSION_NAME}" -Q select . > /dev/null; then
 		game_command save-off
 		game_command save-all
 		sync && wait
-		${SUDO_CMD} tar -C "${SERVER_ROOT}" -czf "${BACKUP_DEST}/${FILE}" --totals ${BACKUP_PATHS} 2>&1 | grep -v "tar: Removing leading "
+		${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
 	else
-		${SUDO_CMD} tar -C "${SERVER_ROOT}" -czf "${BACKUP_DEST}/${FILE}" --totals ${BACKUP_PATHS} 2>&1 | grep -v "tar: Removing leading "
+		${SUDO_CMD} tar -C "${SERVER_ROOT}" -cf "${BACKUP_DEST}/${fname}" ${BACKUP_PATHS} --totals ${BACKUP_FLAGS} 2>&1 | grep -v "tar: Removing leading "
 	fi
 	echo -e "\e[39;1mbackup completed\e[0m\n"
 
 	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
-		for old_backup in $(for f in "${BACKUP_DEST}"/[0-9_.]*; do echo "${f}"; done | head -n"$(( BACKUP_COUNT - KEEP_BACKUPS ))"); do
+	backup_count=$(for f in "${BACKUP_DEST}"/[0-9_.]*; do echo "${f}"; done | wc -l)
+	if [[ $(( backup_count - KEEP_BACKUPS )) -gt 0 ]]; then
+		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)"
+		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)"
 	fi
@@ -358,10 +358,10 @@ backup_restore() {
 		if [[ $user_choice =~ ^-?[0-9]+$ ]]; then
 			n=1
 			for f in "${BACKUP_DEST}"/[0-9_.]*; do
-				[[ ${n} -eq $user_choice ]] && FILE="$f"
+				[[ ${n} -eq $user_choice ]] && fname="$f"
 				n=$(( n + 1 ))
 			done
-			if [[ -z $FILE ]]; then
+			if [[ -z $fname ]]; then
 				>&2 echo -e "\e[39;1mFailed\e[0m to interpret your input. Please enter the digit of the presented options."
 				exit 5
 			fi
@@ -372,10 +372,10 @@ backup_restore() {
 	elif [[ $# -eq 1 ]]; then
 		# Check for the existance of the specified file
 		if [[ -f "$1" ]]; then
-			FILE="$1"
+			fname="$1"
 		else
 			if [[ -f "${BACKUP_DEST}"/"$1" ]]; then
-				FILE="${BACKUP_DEST}"/"$1"
+				fname="${BACKUP_DEST}"/"$1"
 			else
 				>&2 echo -e "Sorry, but '$1', is \e[39;1mnot a valid file\e[0m, neither in your current directory nor in the backup folder."
 				exit 4
@@ -388,7 +388,7 @@ backup_restore() {
 	fi
 
 	echo "Restoring backup..."
-	if ${SUDO_CMD} tar -xf "${FILE}" -C "${SERVER_ROOT}" 2>&1; then
+	if ${SUDO_CMD} tar -xf "${fname}" -C "${SERVER_ROOT}" 2>&1; then
 		echo -e "\e[39;1mRestoration completed\e[0m"
 	else
 		echo -e "\e[39;1mFailed to restore backup.\e[0m"