Upgrade: 1.11.2_13.20.1.2386-7

5 files changed, 33 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b224c84ce035..9be0c4075005 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = forge-server-1.11.2
 	pkgdesc = Minecraft Forge server unit files, script and jar
 	pkgver = 1.11.2_13.20.1.2386
-	pkgrel = 6
+	pkgrel = 7
 	url = https://minecraftforge.net
 	install = forge-server.install
 	arch = any
diff --git a/.gitignore b/.gitignore
index c0d97599f6ff..d71b8845962f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 !forged.service
 !forged.sh
 !forge-server.install
+!forge-server-custom.install
 !PKGBUILD
 !.gitignore
 !.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 9b1596c31d2a..3ee3f750eea1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 ## Contributor: Philip Abernethy <chais.z3r0@gmail.com>
 ## Contributor: sowieso <sowieso@dukun.de>
 
-[ -z "$FORGE_SRV_PKGVER" ] && FORGE_SRV_PKGVER="1.11.2_13.20.1.2386-6"
+[ -z "$FORGE_SRV_PKGVER" ] && FORGE_SRV_PKGVER="1.11.2_13.20.1.2386-7"
 [ -z "$FORGE_SRV_MCVER_LATEST" ] && FORGE_SRV_MCVER_LATEST="1.14.4"
 
 IFS="-" read -ra _ver_temp <<< "$FORGE_SRV_PKGVER"
@@ -33,7 +33,7 @@ optdepends=("tar: needed in order to create world backups"
 provides=("forge-server=${pkgver}")
 conflicts=("forge-server")
 backup=("etc/conf.d/forge")
-[ "$FORGE_SRV_PKGVER" = "1.11.2_13.20.1.2386-6" ] && install="forge-server.install" || install="forge-server-custom.install"
+[ "$FORGE_SRV_PKGVER" = "1.11.2_13.20.1.2386-7" ] && install="forge-server.install" || install="forge-server-custom.install"
 source=("forged-backup.service"
 	"forged-backup.timer"
 	"forged.service"
diff --git a/forge-server-custom.install b/forge-server-custom.install
new file mode 100644
index 000000000000..b42577dcd3f3
--- /dev/null
+++ b/forge-server-custom.install
@@ -0,0 +1,28 @@
+post_install() {
+	if ! getent group "forge" &>/dev/null; then
+		echo "Adding forge system group..."
+		groupadd -r forge 1>/dev/null
+	fi
+
+	if ! getent passwd "forge" &>/dev/null; then
+		echo "Adding forge system user..."
+		useradd -r -g forge -d /srv/forge forge 1>/dev/null
+	fi
+
+	chown -R forge:forge /srv/forge
+
+	echo "The world data is stored under /srv/forge and the server runs as the forge user to increase security."
+	echo "Use the forged script under /usr/bin/forged to start, stop or backup the server."
+	echo "Adjust the configuration file under /etc/conf.d/forge to your liking."
+	echo "For the server to start you have to accept the EULA in /srv/forge/eula.txt!"
+	echo "The EULA file is generated after the first server start."
+}
+
+post_upgrade() {
+	chown -R forge:forge /srv/forge
+}
+
+post_remove() {
+	[ -d "/srv/forge" ] && echo "Game saves in /srv/forge were kept on your system."
+	echo "The forge user was preserved on your system."
+}
diff --git a/forge-server.install b/forge-server.install
index 9ee09d1d23e8..30ee9a66451a 100644
--- a/forge-server.install
+++ b/forge-server.install
@@ -1,4 +1,4 @@
-_good_ver="1.11.2_13.20.1.2386-6"
+_good_ver="1.11.2_13.20.1.2386-7"
 
 post_install() {
 	if ! getent group "forge" &>/dev/null; then