Upgrade: 1.12.2_14.23.5.2768-9

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 3d8fd4a80d0c..6c1e9ed0e80d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = forge-server-1.12.2
 	pkgdesc = Minecraft Forge server unit files, script and jar
 	pkgver = 1.12.2_14.23.5.2768
-	pkgrel = 8
+	pkgrel = 9
 	url = https://minecraftforge.net
 	install = forge-server.install
 	arch = any
@@ -26,11 +26,11 @@ pkgbase = forge-server-1.12.2
 	source = LICENSE-Paulscode%20IBXM%20Library-forge-server-1.12.2-1.12.2-14.23.5.2768.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.12.x/LICENSE-Paulscode%20IBXM%20Library.txt
 	source = LICENSE-Paulscode%20SoundSystem%20CodecIBXM-forge-server-1.12.2-1.12.2-14.23.5.2768.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.12.x/LICENSE-Paulscode%20SoundSystem%20CodecIBXM.txt
 	source = LICENSE-forge-server-1.12.2-1.12.2-14.23.5.2768.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.12.x/LICENSE.txt
-	sha512sums = 40d7c1a3b904525ced4dc3b7f2db431d155d83af124b0dc5fddf62aec368c1f21e823e6cf1f80ab35e13b0e16feeeadeca78d7c6afe6ecce8ecfa37dcfe56d79
+	sha512sums = b5e6cd391873c86284c1d5d29e445fc5969790cf35fe01b3d6a7f27b285f47ae93d3ce3a7853fdabe984be7576b1dc534c3f8cd6cdbfb1d863aaed4bc4d1840f
 	sha512sums = 50bb0c0bcb40243fa1ed10c4f7d1f24c3ae7073bd9a09eb31ab4b61d55e0cd1867298ab5cf5c0b0bbf549a194fc6502acec6386c6f9dec0b1a2e516734a35fbd
 	sha512sums = e8dc99ee822bb401dbbae6d4bb768bc60e4a48b7b03b624ffd9efa8a49b9c5adaba2d3e28d78d4bdb740acc874aa13bbb9e99953ac6f7845e9616659e4269f93
-	sha512sums = 30a6910c3042d5cb15dbaf785e25e5c7f69745be03b60c8bf4c3562213d2fc61c0e5b72c0a3bafca33ab599e5bf2baac408fd4b9676f7fe4da50d77d8982d4a6
-	sha512sums = afa657796cb57971cb3c6ae6147ed6756998bac1260631b26d7dd76a2b4474421ff056d4cf2683e7567de33771bfa88bcc50cd149708eca491cc95128b6fd910
+	sha512sums = 8afd9878a14636cbb84bff2a001917c26844204166ecd453dda6d46aa972fa013a9c3e48b2f556c4bda503bc0e6374f5e5afcff6886af62dd84d5db83633b4b1
+	sha512sums = 4cca7835f967987e13fa30dda116aefeff9be4ca2d1e8ba5e8704ac365d385491d577352ab75d06b660963c0b37a0bd35c6d984b48bac50a5818e1df09947112
 	sha512sums = fefaabeccd17b98752cbef8bd01f4bce27e351106c256edf6aba92267e0fc4ded36fba089f9b7f5fc2d210e5f7b07bca38d8254a2f4732516720e45a249dc5c2
 	sha512sums = 7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3
 	sha512sums = 2c9bdefe7d022be139e7aec2e5f1cc1f83ea9d35d2c945e26422e140027b5107ce32c56f0b97e7dbf6b6edb282075df4a18c156a6ed6b064bcb10a3b4481a9aa
diff --git a/PKGBUILD b/PKGBUILD
index 093a3f1a9d27..b6cabb0f2327 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 ## Contributor: Philip Abernethy <chais.z3r0@gmail.com>
 ## Contributor: sowieso <sowieso@dukun.de>
 
-_ver="1.12.2_14.23.5.2768-8"
+_ver="1.12.2_14.23.5.2768-9"
 _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=('40d7c1a3b904525ced4dc3b7f2db431d155d83af124b0dc5fddf62aec368c1f21e823e6cf1f80ab35e13b0e16feeeadeca78d7c6afe6ecce8ecfa37dcfe56d79'
+sha512sums=('b5e6cd391873c86284c1d5d29e445fc5969790cf35fe01b3d6a7f27b285f47ae93d3ce3a7853fdabe984be7576b1dc534c3f8cd6cdbfb1d863aaed4bc4d1840f'
             '50bb0c0bcb40243fa1ed10c4f7d1f24c3ae7073bd9a09eb31ab4b61d55e0cd1867298ab5cf5c0b0bbf549a194fc6502acec6386c6f9dec0b1a2e516734a35fbd'
             'e8dc99ee822bb401dbbae6d4bb768bc60e4a48b7b03b624ffd9efa8a49b9c5adaba2d3e28d78d4bdb740acc874aa13bbb9e99953ac6f7845e9616659e4269f93'
-            '30a6910c3042d5cb15dbaf785e25e5c7f69745be03b60c8bf4c3562213d2fc61c0e5b72c0a3bafca33ab599e5bf2baac408fd4b9676f7fe4da50d77d8982d4a6'
-            'afa657796cb57971cb3c6ae6147ed6756998bac1260631b26d7dd76a2b4474421ff056d4cf2683e7567de33771bfa88bcc50cd149708eca491cc95128b6fd910'
+            '8afd9878a14636cbb84bff2a001917c26844204166ecd453dda6d46aa972fa013a9c3e48b2f556c4bda503bc0e6374f5e5afcff6886af62dd84d5db83633b4b1'
+            '4cca7835f967987e13fa30dda116aefeff9be4ca2d1e8ba5e8704ac365d385491d577352ab75d06b660963c0b37a0bd35c6d984b48bac50a5818e1df09947112'
             'fefaabeccd17b98752cbef8bd01f4bce27e351106c256edf6aba92267e0fc4ded36fba089f9b7f5fc2d210e5f7b07bca38d8254a2f4732516720e45a249dc5c2'
             '7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3'
             '2c9bdefe7d022be139e7aec2e5f1cc1f83ea9d35d2c945e26422e140027b5107ce32c56f0b97e7dbf6b6edb282075df4a18c156a6ed6b064bcb10a3b4481a9aa'
diff --git a/forged-backup.service b/forged-backup.service
index acd1b6a54fb7..5f5743722e0e 100644
--- a/forged-backup.service
+++ b/forged-backup.service
@@ -3,7 +3,7 @@ Description=Minecraft Forge 1.12.2 Server World Backup
 After=local-fs.target
 
 [Service]
-Type=forking
+Type=simple
 ExecStart=/usr/bin/forge-1.12.2d backup
 User=forge-1-12-2
 Group=forge-1-12-2
diff --git a/forged.conf b/forged.conf
index c662ee982cf2..6e1eb1542fcb 100644
--- a/forged.conf
+++ b/forged.conf
@@ -5,6 +5,7 @@
 SERVER_ROOT="/srv/forge-1.12.2"
 BACKUP_DEST="/srv/forge-1.12.2/backup"
 BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT
+BACKUP_FLAGS="-z"
 KEEP_BACKUPS="10"
 GAME_USER="forge-1-12-2"
 MAIN_EXECUTABLE="forge.jar"
diff --git a/forged.sh b/forged.sh
index 87d7c5e70078..5bf1014485fb 100755
--- a/forged.sh
+++ b/forged.sh
@@ -12,6 +12,7 @@ declare -r game="forge-1.12.2"
 [[ -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-12-2"
 [[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge.jar"
@@ -30,7 +31,6 @@ declare -r game="forge-1.12.2"
 # 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"