Upgrade: 1.12.2_14.23.5.2768-8

1 files changed, 35 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 12150c1544d4..093a3f1a9d27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@
 ## Contributor: Philip Abernethy <chais.z3r0@gmail.com>
 ## Contributor: sowieso <sowieso@dukun.de>
 
-[ -z "$FORGE_SRV_PKGVER" ] && FORGE_SRV_PKGVER="1.12.2_14.23.5.2768-7"
-[ -z "$FORGE_SRV_MCVER_LATEST" ] && FORGE_SRV_MCVER_LATEST="1.14.4"
+_ver="1.12.2_14.23.5.2768-8"
+_minecraft_ver_latest="1.14.4"
 
-IFS="-" read -ra _ver_temp <<< "$FORGE_SRV_PKGVER"
+IFS="-" read -ra _ver_temp <<< "$_ver"
 IFS="_" read -ra _pkgver_temp <<< "${_ver_temp[0]}"
 IFS="." read -ra _minecraft_ver_temp <<< "${_pkgver_temp[0]}"
 
@@ -18,10 +18,16 @@ _minecraft_ver_minor=${_minecraft_ver_temp[1]:-0}
 _minecraft_ver_patch=${_minecraft_ver_temp[2]:-0}
 _forge_ver=${_pkgver_temp[1]}
 
-_pkgver="${_minecraft_ver}-${_forge_ver}"
+_pkgver=${_ver_temp[0]//_/-}
 
-[ "$_minecraft_ver" = "$FORGE_SRV_MCVER_LATEST" ] && pkgname="forge-server" || pkgname="forge-server-${_minecraft_ver}"
-pkgver=${_pkgver//-/_}
+if [ "$_minecraft_ver" = "$_minecraft_ver_latest" ]; then
+	pkgname="forge-server"
+	_forge_name="forge"
+else
+	pkgname="forge-server-${_minecraft_ver}"
+	_forge_name="forge-${_minecraft_ver}"
+fi
+pkgver=${_ver_temp[0]}
 pkgrel=${_ver_temp[1]}
 pkgdesc="Minecraft Forge server unit files, script and jar"
 arch=("any")
@@ -31,20 +37,19 @@ depends=("java-runtime-headless=8" "screen" "sudo" "bash" "awk" "sed")
 optdepends=("tar: needed in order to create world backups"
 	"netcat: required in order to suspend an idle server")
 provides=("forge-server=${pkgver}")
-conflicts=("forge-server")
-backup=("etc/conf.d/forge")
-[ "$FORGE_SRV_PKGVER" = "1.12.2_14.23.5.2768-7" ] && install="forge-server.install" || install="forge-server-custom.install"
+backup=("etc/conf.d/${_forge_name}")
+install="forge-server.install"
 source=("forged-backup.service"
 	"forged-backup.timer"
 	"forged.service"
 	"forged.conf"
 	"forged.sh")
 noextract=("forge-${_pkgver}.jar")
-sha512sums=('e9a391a330320a7aea127a3e8ad399d8d6e3c926eac2c0df7a4e550ba61cc13fec737f7e984bd98b9e1f9f9d5a654ee241eeef6a2e433ec845e300ef29405f62'
-            'a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4'
-            'd6bde61a7aa479b85e35b4a3eccb9b3237a6c97f8919b3d704434f1df15672b74c7ae9ca9473eea6a0593e6e80892a2510782115185c1b7fe332720ccb78a7bd'
-            '6c82f776e337d8c5eca11fea87ce6f6cfe4a5e881db947336d9c8605bd36a4ce0b7b8811e11d79285dd855cd2bdc3f65526b7aaa8d47cb14a7b8cf452462329c'
-            '2a9a911e9290573718d7cf00a834e4dc0211c63a2de4d132c0b6c418d2616084dee68b934ae6e6554a0f6a037e35620d2df8b8d736acbd2fe8f71e0656c3ea46'
+sha512sums=('40d7c1a3b904525ced4dc3b7f2db431d155d83af124b0dc5fddf62aec368c1f21e823e6cf1f80ab35e13b0e16feeeadeca78d7c6afe6ecce8ecfa37dcfe56d79'
+            '50bb0c0bcb40243fa1ed10c4f7d1f24c3ae7073bd9a09eb31ab4b61d55e0cd1867298ab5cf5c0b0bbf549a194fc6502acec6386c6f9dec0b1a2e516734a35fbd'
+            'e8dc99ee822bb401dbbae6d4bb768bc60e4a48b7b03b624ffd9efa8a49b9c5adaba2d3e28d78d4bdb740acc874aa13bbb9e99953ac6f7845e9616659e4269f93'
+            '30a6910c3042d5cb15dbaf785e25e5c7f69745be03b60c8bf4c3562213d2fc61c0e5b72c0a3bafca33ab599e5bf2baac408fd4b9676f7fe4da50d77d8982d4a6'
+            'afa657796cb57971cb3c6ae6147ed6756998bac1260631b26d7dd76a2b4474421ff056d4cf2683e7567de33771bfa88bcc50cd149708eca491cc95128b6fd910'
             'fefaabeccd17b98752cbef8bd01f4bce27e351106c256edf6aba92267e0fc4ded36fba089f9b7f5fc2d210e5f7b07bca38d8254a2f4732516720e45a249dc5c2'
             '7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3'
             '2c9bdefe7d022be139e7aec2e5f1cc1f83ea9d35d2c945e26422e140027b5107ce32c56f0b97e7dbf6b6edb282075df4a18c156a6ed6b064bcb10a3b4481a9aa'
@@ -117,12 +122,14 @@ prepare() {
 }
 
 package() {
+	_server_root="${pkgdir}/srv/${_forge_name}"
+
 	# Install forged
-	install -Dm644 "forged-backup.service" "${pkgdir}/usr/lib/systemd/system/forged-backup.service"
-	install -Dm644 "forged-backup.timer" "${pkgdir}/usr/lib/systemd/system/forged-backup.timer"
-	install -Dm644 "forged.service" "${pkgdir}/usr/lib/systemd/system/forged.service"
-	install -Dm644 "forged.conf" "${pkgdir}/etc/conf.d/forge"
-	install -Dm755 "forged.sh" "${pkgdir}/usr/bin/forged"
+	install -Dm644 "forged-backup.service" "${pkgdir}/usr/lib/systemd/system/${_forge_name}d-backup.service"
+	install -Dm644 "forged-backup.timer" "${pkgdir}/usr/lib/systemd/system/${_forge_name}d-backup.timer"
+	install -Dm644 "forged.service" "${pkgdir}/usr/lib/systemd/system/${_forge_name}d.service"
+	install -Dm644 "forged.conf" "${pkgdir}/etc/conf.d/${_forge_name}"
+	install -Dm755 "forged.sh" "${pkgdir}/usr/bin/${_forge_name}d"
 
 	# Install Forge
 	_forge_jar="forge-${_pkgver}.jar"
@@ -130,22 +137,22 @@ package() {
 	[ "$_minecraft_ver_minor" = 7 ] && _forge_jar="forge-${_pkgver}-${_minecraft_ver}-universal.jar"
 	[ "$_minecraft_ver_minor" -le 6 ] && _forge_jar="minecraftforge-universal-${_pkgver}.jar"
 
-	install -Dm644 "$_forge_jar" "${pkgdir}/srv/forge/$_forge_jar"
-	ln -s "$_forge_jar" "${pkgdir}/srv/forge/forge.jar"
-	find libraries -type f -print0 | xargs -0 -i@ install -Dm644 "@" "${pkgdir}/srv/forge/@"
-	[ "$_minecraft_ver_minor" = 5 ] && find lib -type f -print0 | xargs -0 -i@ install -Dm644 "@" "${pkgdir}/srv/forge/@"
+	install -Dm644 "$_forge_jar" "${_server_root}/$_forge_jar"
+	ln -s "$_forge_jar" "${_server_root}/forge.jar"
+	find libraries -type f -print0 | xargs -0 -i@ install -Dm644 "@" "${_server_root}/@"
+	[ "$_minecraft_ver_minor" = 5 ] && find lib -type f -print0 | xargs -0 -i@ install -Dm644 "@" "${_server_root}/@"
 
 	# Install Minecraft Server (for 1.12.2 or lower)
 	if [ "$_minecraft_ver_minor" = 5 ]; then
-		install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${pkgdir}/srv/forge/minecraft_server.jar"
+		install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${_server_root}/minecraft_server.jar"
 	elif [ "$_minecraft_ver_minor" -le 12 ]; then
-		install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${pkgdir}/srv/forge/minecraft_server.${_minecraft_ver}.jar"
+		install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${_server_root}/minecraft_server.${_minecraft_ver}.jar"
 	fi
 
 	# Link log files
 	mkdir -p "${pkgdir}/var/log/"
-	install -dm2755 "${pkgdir}/srv/forge/logs"
-	ln -s "/srv/forge/logs" "${pkgdir}/var/log/forge"
+	install -dm2755 "${_server_root}/logs"
+	ln -s "/srv/${_forge_name}/logs" "${pkgdir}/var/log/${_forge_name}"
 
 	# Install licenses
 	for _license in "${_licenses[@]}"; do
@@ -154,5 +161,5 @@ package() {
 		install -Dm644 "$_license" "${pkgdir}/usr/share/licenses/${pkgname}/$_filename"
 	done
 
-	chmod g+ws "${pkgdir}/srv/forge"
+	chmod g+ws "${_server_root}"
 }