Upgrade: 1.10.2_12.18.3.2185-8

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 6fd43106996d..5565f69bc68a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = forge-server-1.10.2
 	pkgdesc = Minecraft Forge server unit files, script and jar
 	pkgver = 1.10.2_12.18.3.2185
-	pkgrel = 7
+	pkgrel = 8
 	url = https://minecraftforge.net
 	install = forge-server.install
 	arch = any
@@ -28,11 +28,11 @@ pkgbase = forge-server-1.10.2
 	source = Paulscode%20SoundSystem%20CodecIBXM%20License-forge-server-1.10.2-1.10.2-12.18.3.2185.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.10.x/Paulscode%20SoundSystem%20CodecIBXM%20License.txt
 	source = LICENSE-fml-forge-server-1.10.2-1.10.2-12.18.3.2185.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.10.x/LICENSE-fml.txt
 	source = LICENSE-new-forge-server-1.10.2-1.10.2-12.18.3.2185.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.10.x/LICENSE-new.txt
-	sha512sums = 3eef7cc64adc2ff5f1c3c948c641288b4cc9aa4445a87e944edfd38fa855ad08413e6b575a2fd53409c46266329facc9e1d532906c0771a7d5b7b5c4a9473426
+	sha512sums = 40a09ecd0877af2573ea2b711b97318afb8fd1bd13cdfc7838510fd3ccff140460c10932bf0fa997f707421a2fa8630ba0223b6ca0989bbced2f6b3f7240c2fb
 	sha512sums = 46e5bb0973420bb5701fb6c918e56d9c755d0483209145ada4e06fc6d73fe4dfbcf240846cc299da1dfd12b75e6ae7af12e86bc3dda0388b217f526fb91785b0
 	sha512sums = 079fa3b2b46cde3fc9d076bf193a58a98fd9c30a7e21a32e64f60abe95b8f9231501bb4d188e776dd2ba5ed2ebe955b18e953db6a0686895e01b9f417fb29aca
-	sha512sums = 69ca3990c042f839b261c139a44b6780aa8466cbd47609976460593f9055717c3128c5c87d9b4bdff88f4bad36aaa9da6f3ab87e59c650192cb65d57dd9c25ba
-	sha512sums = 183d9f401a65ab0e9893da8ee533d4a5a1f894b5c700c4a346b431ae156e111f8e8893f1b4c56213bb70c2a062328c695256bd47f058e368f6c24af549fe8510
+	sha512sums = db7c40f3f54c35ad06a2ea4a017e8989f83da56c14d2389b53d9948056d1aecaf8e4bb61ee24bfdffa8bd82c748136ec5841106ec7fe5f9c6d8844cfb52ad789
+	sha512sums = c4983d0f4b2011f0ffed810ed7f69ea557ed8166b1c336401d6ea56e3f58bffa282059790ceb04384d1a1e728555ea7aecfe0d5c0cc9da2838957423bb08f806
 	sha512sums = 12ef115f29883ee48ddfe0463e5a817d8754fba776d97951347b9d657227836f148c392df49eaed61887f7fb7f8653321ba419e07d34df89e76888e42f2283ae
 	sha512sums = dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15
 	sha512sums = 7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3
diff --git a/PKGBUILD b/PKGBUILD
index a5fb6d5f2f2b..bafda9d8bae5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 ## Contributor: Philip Abernethy <chais.z3r0@gmail.com>
 ## Contributor: sowieso <sowieso@dukun.de>
 
-_ver="1.10.2_12.18.3.2185-7"
+_ver="1.10.2_12.18.3.2185-8"
 _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=('3eef7cc64adc2ff5f1c3c948c641288b4cc9aa4445a87e944edfd38fa855ad08413e6b575a2fd53409c46266329facc9e1d532906c0771a7d5b7b5c4a9473426'
+sha512sums=('40a09ecd0877af2573ea2b711b97318afb8fd1bd13cdfc7838510fd3ccff140460c10932bf0fa997f707421a2fa8630ba0223b6ca0989bbced2f6b3f7240c2fb'
             '46e5bb0973420bb5701fb6c918e56d9c755d0483209145ada4e06fc6d73fe4dfbcf240846cc299da1dfd12b75e6ae7af12e86bc3dda0388b217f526fb91785b0'
             '079fa3b2b46cde3fc9d076bf193a58a98fd9c30a7e21a32e64f60abe95b8f9231501bb4d188e776dd2ba5ed2ebe955b18e953db6a0686895e01b9f417fb29aca'
-            '69ca3990c042f839b261c139a44b6780aa8466cbd47609976460593f9055717c3128c5c87d9b4bdff88f4bad36aaa9da6f3ab87e59c650192cb65d57dd9c25ba'
-            '183d9f401a65ab0e9893da8ee533d4a5a1f894b5c700c4a346b431ae156e111f8e8893f1b4c56213bb70c2a062328c695256bd47f058e368f6c24af549fe8510'
+            'db7c40f3f54c35ad06a2ea4a017e8989f83da56c14d2389b53d9948056d1aecaf8e4bb61ee24bfdffa8bd82c748136ec5841106ec7fe5f9c6d8844cfb52ad789'
+            'c4983d0f4b2011f0ffed810ed7f69ea557ed8166b1c336401d6ea56e3f58bffa282059790ceb04384d1a1e728555ea7aecfe0d5c0cc9da2838957423bb08f806'
             '12ef115f29883ee48ddfe0463e5a817d8754fba776d97951347b9d657227836f148c392df49eaed61887f7fb7f8653321ba419e07d34df89e76888e42f2283ae'
             'dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15'
             '7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3'
diff --git a/forged-backup.service b/forged-backup.service
index 8908056135cf..c222dd10b4ea 100644
--- a/forged-backup.service
+++ b/forged-backup.service
@@ -3,7 +3,7 @@ Description=Minecraft Forge 1.10.2 Server World Backup
 After=local-fs.target
 
 [Service]
-Type=forking
+Type=simple
 ExecStart=/usr/bin/forge-1.10.2d backup
 User=forge-1-10-2
 Group=forge-1-10-2
diff --git a/forged.conf b/forged.conf
index 59e7725bb3b2..c15f3cec1525 100644
--- a/forged.conf
+++ b/forged.conf
@@ -5,6 +5,7 @@
 SERVER_ROOT="/srv/forge-1.10.2"
 BACKUP_DEST="/srv/forge-1.10.2/backup"
 BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT
+BACKUP_FLAGS="-z"
 KEEP_BACKUPS="10"
 GAME_USER="forge-1-10-2"
 MAIN_EXECUTABLE="forge.jar"
diff --git a/forged.sh b/forged.sh
index cce5f0e698c2..b891dc5225d6 100755
--- a/forged.sh
+++ b/forged.sh
@@ -12,6 +12,7 @@ declare -r game="forge-1.10.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-10-2"
 [[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge.jar"
@@ -30,7 +31,6 @@ declare -r game="forge-1.10.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"