Upgrade: 1.9.4_12.17.0.1976-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 f66c2272e8aa..1175c885b803 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = forge-server-1.9.4
 	pkgdesc = Minecraft Forge server unit files, script and jar
 	pkgver = 1.9.4_12.17.0.1976
-	pkgrel = 5
+	pkgrel = 6
 	url = https://minecraftforge.net
 	install = forge-server.install
 	arch = any
@@ -28,11 +28,11 @@ pkgbase = forge-server-1.9.4
 	source = Paulscode%20SoundSystem%20CodecIBXM%20License-forge-server-1.9.4-1.9.4-12.17.0.1976.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.9.4/Paulscode%20SoundSystem%20CodecIBXM%20License.txt
 	source = LICENSE-fml-forge-server-1.9.4-1.9.4-12.17.0.1976.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.9.4/LICENSE-fml.txt
 	source = LICENSE-new-forge-server-1.9.4-1.9.4-12.17.0.1976.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.9.4/LICENSE-new.txt
-	sha512sums = 1e12e06876f359a04658ebd9593abe00d5eabcd4a603dd9fe81dba8ecddf9b21a7f4371ad52a2a6aa57981f9df3af2ccb33cae2eef7cb1acbbc84cc4a90b8434
+	sha512sums = c5f59e8ebee35019da160bd816b508ddc8822253faf4ff286062f8615767aa1e6eed56955711fdbbe0e46eeb1261adee3aef482cdd1e099246716d52638aa462
 	sha512sums = 87fb390c49084fe5489ea10fc1246723f1e63ae818726aa2d0a6376621e8dad2947607671e7699d1b2a6076034902377e5b9ed8dc2cbb5b0f68fc61ad26aa588
 	sha512sums = 33337a5fd411fbff5781d799f5616a4af95eac0b8fcbd1f83f69dd00513a1291bf5a70867ca5f93b3716d96fc6173b4f5087d503a50bddad092e67c52c28a81d
-	sha512sums = e13598e105f320bee3627bf96d0bc4536aabab92dda637331392e26b555a4d415748caf82ae1692a50c129d9253876f8c118c5203f827d77780394e587146f47
-	sha512sums = 59977cd65a32ab9c10ae436a83093a7e48caa57188609a8c7866e64b0ec5ec6740c550fb2b880bc296b3b24c5b70374f0215912c2bf9e00d1021ec8f9539fc6a
+	sha512sums = f2514e7012cc535bdffc10150a1e5b65f23f0762706b8698b0ed9c411fc4043c9338d4e58fae0278eb2da12214c9c11cf829211a4e37fd1520f837cc935a0c5f
+	sha512sums = 728a9cba37face58d6c5bd89f8aad9a895476819f0a8251bb1d955eec50a26423443289b97443fac7aa23aec0cd567837b0aad0c13d3f37e27932220e281c993
 	sha512sums = 0f81a142a8dab015734f573fa20cf7089fe6020c23597d72a35a8e4f1e85cf7746aead735c2db6c5f33d186f77ad8a288899c1f7abf5c9b5521bf02031da5382
 	sha512sums = dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15
 	sha512sums = 7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3
diff --git a/PKGBUILD b/PKGBUILD
index 30b0f0a6f8bf..6a667a5ff4ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 ## Contributor: Philip Abernethy <chais.z3r0@gmail.com>
 ## Contributor: sowieso <sowieso@dukun.de>
 
-_ver="1.9.4_12.17.0.1976-5"
+_ver="1.9.4_12.17.0.1976-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=('1e12e06876f359a04658ebd9593abe00d5eabcd4a603dd9fe81dba8ecddf9b21a7f4371ad52a2a6aa57981f9df3af2ccb33cae2eef7cb1acbbc84cc4a90b8434'
+sha512sums=('c5f59e8ebee35019da160bd816b508ddc8822253faf4ff286062f8615767aa1e6eed56955711fdbbe0e46eeb1261adee3aef482cdd1e099246716d52638aa462'
             '87fb390c49084fe5489ea10fc1246723f1e63ae818726aa2d0a6376621e8dad2947607671e7699d1b2a6076034902377e5b9ed8dc2cbb5b0f68fc61ad26aa588'
             '33337a5fd411fbff5781d799f5616a4af95eac0b8fcbd1f83f69dd00513a1291bf5a70867ca5f93b3716d96fc6173b4f5087d503a50bddad092e67c52c28a81d'
-            'e13598e105f320bee3627bf96d0bc4536aabab92dda637331392e26b555a4d415748caf82ae1692a50c129d9253876f8c118c5203f827d77780394e587146f47'
-            '59977cd65a32ab9c10ae436a83093a7e48caa57188609a8c7866e64b0ec5ec6740c550fb2b880bc296b3b24c5b70374f0215912c2bf9e00d1021ec8f9539fc6a'
+            'f2514e7012cc535bdffc10150a1e5b65f23f0762706b8698b0ed9c411fc4043c9338d4e58fae0278eb2da12214c9c11cf829211a4e37fd1520f837cc935a0c5f'
+            '728a9cba37face58d6c5bd89f8aad9a895476819f0a8251bb1d955eec50a26423443289b97443fac7aa23aec0cd567837b0aad0c13d3f37e27932220e281c993'
             '0f81a142a8dab015734f573fa20cf7089fe6020c23597d72a35a8e4f1e85cf7746aead735c2db6c5f33d186f77ad8a288899c1f7abf5c9b5521bf02031da5382'
             'dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15'
             '7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3'
diff --git a/forged-backup.service b/forged-backup.service
index 98ab8e9a80bb..2bb18d49910a 100644
--- a/forged-backup.service
+++ b/forged-backup.service
@@ -3,7 +3,7 @@ Description=Minecraft Forge 1.9.4 Server World Backup
 After=local-fs.target
 
 [Service]
-Type=forking
+Type=simple
 ExecStart=/usr/bin/forge-1.9.4d backup
 User=forge-1-9-4
 Group=forge-1-9-4
diff --git a/forged.conf b/forged.conf
index 7e0bde513e72..30731e55027f 100644
--- a/forged.conf
+++ b/forged.conf
@@ -5,6 +5,7 @@
 SERVER_ROOT="/srv/forge-1.9.4"
 BACKUP_DEST="/srv/forge-1.9.4/backup"
 BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT
+BACKUP_FLAGS="-z"
 KEEP_BACKUPS="10"
 GAME_USER="forge-1-9-4"
 MAIN_EXECUTABLE="forge.jar"
diff --git a/forged.sh b/forged.sh
index 9d462ab1a87f..cc354b49ae9a 100755
--- a/forged.sh
+++ b/forged.sh
@@ -12,6 +12,7 @@ declare -r game="forge-1.9.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-9-4"
 [[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge.jar"
@@ -30,7 +31,6 @@ declare -r game="forge-1.9.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"