release: code update

3 files changed, 30 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2f26738ff98..ec14ddf65c0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = forge-server
 	pkgdesc = Forge is a free, open-source modding API all of your favourite mods use!
 	pkgver = 41.0.109
-	pkgrel = 1
+	pkgrel = 2
 	url = https://minecraftforge.net
 	install = forge-server.install
 	arch = any
@@ -9,16 +9,17 @@ pkgbase = forge-server
 	makedepends = jdk-openjdk
 	depends = jdk-openjdk
 	depends = tmux
+	depends = forge-hooks
 	optdepends = tar: needed in order to create world backups
 	optdepends = netcat: required in order to suspend an idle server
 	provides = forge-server=41.0.109
 	noextract = forge-1.19-41.0.109-installer.jar
 	backup = etc/conf.d/forge
-	source = https://maven.minecraftforge.net/net/minecraftforge/forge/1.19-41.0.109/forge-1.19-41.0.109-installer.jar
-	source = forge-scripts::git+https://github.com/Edenhofer/minecraft-server
+	source = git+https://github.com/Edenhofer/minecraft-server
 	source = https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.19.x/LICENSE.txt
-	sha512sums = 78b7ea6c255d20c60f6cccbe835c93fd27c6638a5e98fefa1d5c4c5e324808a640366262f1f29725f207b1c2f7bd4c35422f21a798f89886dc68adf5b558a5e9
+	source = https://maven.minecraftforge.net/net/minecraftforge/forge/1.19-41.0.109/forge-1.19-41.0.109-installer.jar
 	sha512sums = SKIP
 	sha512sums = 3da10d63a5edee4bc8bcd3d5c2730771062f7fa58626a8c51635fbe96bfbceca3ff6937cfaad3e17f16a94ef95137f7c78cc6dac1c846a6b9a8f18d3c6355973
+	sha512sums = 78b7ea6c255d20c60f6cccbe835c93fd27c6638a5e98fefa1d5c4c5e324808a640366262f1f29725f207b1c2f7bd4c35422f21a798f89886dc68adf5b558a5e9
 
 pkgname = forge-server
diff --git a/PKGBUILD b/PKGBUILD
index 8e3fe3d5156d..fa341a5df749 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,26 +11,26 @@ minver=1.19
 srvpath=/srv/forge
 
 pkgver=41.0.109
-pkgrel=1
+pkgrel=2
 pkgname=forge-server
 pkgdesc="Forge is a free, open-source modding API all of your favourite mods use!"
 url="https://minecraftforge.net"
 arch=('any')
 license=("custom")
-depends=("jdk-openjdk" "tmux")
+depends=("jdk-openjdk" "tmux" "forge-hooks")
 makedepends=("jdk-openjdk")
 optdepends=("tar: needed in order to create world backups"
 						"netcat: required in order to suspend an idle server")
 provides=("forge-server=${pkgver}")
 backup=("etc/conf.d/forge")
-install="forge-server.install"
-source=(https://maven.minecraftforge.net/net/minecraftforge/forge/${minver}-${pkgver}/forge-${minver}-${pkgver}-installer.jar
-				forge-scripts::git+https://github.com/Edenhofer/minecraft-server
-				https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/${minver}.x/LICENSE.txt)
+install=forge-server.install
+source=(git+https://github.com/Edenhofer/minecraft-server
+				https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/${minver}.x/LICENSE.txt
+				https://maven.minecraftforge.net/net/minecraftforge/forge/${minver}-${pkgver}/forge-${minver}-${pkgver}-installer.jar)
 noextract=(forge-${minver}-${pkgver}-installer.jar)
-sha512sums=('78b7ea6c255d20c60f6cccbe835c93fd27c6638a5e98fefa1d5c4c5e324808a640366262f1f29725f207b1c2f7bd4c35422f21a798f89886dc68adf5b558a5e9'
-            'SKIP'
-            '3da10d63a5edee4bc8bcd3d5c2730771062f7fa58626a8c51635fbe96bfbceca3ff6937cfaad3e17f16a94ef95137f7c78cc6dac1c846a6b9a8f18d3c6355973')
+sha512sums=('SKIP'
+            '3da10d63a5edee4bc8bcd3d5c2730771062f7fa58626a8c51635fbe96bfbceca3ff6937cfaad3e17f16a94ef95137f7c78cc6dac1c846a6b9a8f18d3c6355973'
+            '78b7ea6c255d20c60f6cccbe835c93fd27c6638a5e98fefa1d5c4c5e324808a640366262f1f29725f207b1c2f7bd4c35422f21a798f89886dc68adf5b558a5e9')
 
 frgpath=${srvpath}/libraries/net/minecraftforge/forge/${minver}-${pkgver}
 
@@ -41,7 +41,7 @@ prepare() {
 }
 
 build() {
-	cd forge-scripts
+	cd minecraft-server
 
 	make \
 		GAME=forge \
@@ -53,7 +53,7 @@ build() {
 }
 
 package() {
-	cd forge-scripts
+	cd minecraft-server
 
 	make \
 		GAME=forge \
@@ -70,5 +70,14 @@ package() {
 	find libraries -type f -print0 | xargs -0 -i@ install -Dm644 "@" "${pkgdir}${srvpath}/@"
 
 	install -Dm 644 user_jvm_args.txt ${pkgdir}${frgpath}/user_jvm_args.txt
-	install -Dm 644 ../LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+	install -Dm 644 $srcdir/LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+	mkdir -p $pkgdir/var/log/
+
+	install -dm2755 $pkgdir$srvpath/logs
+	install -dm2755 $pkgdir$srvpath/mods
+
+	ln -s ${srvpath}/logs $pkgdir/var/log/forge
+
+	chmod g+ws $pkgdir$srvpath
 }
diff --git a/forge-server.install b/forge-server.install
index 9309b66b7b6b..5150eaf253fc 100644
--- a/forge-server.install
+++ b/forge-server.install
@@ -3,6 +3,8 @@ _user="forge"
 _server_root="/srv/forge"
 
 post_install() {
+	chown -R "${user}:${user}" "$_server_root"
+
 	echo "The world data is stored under ${_server_root} and the server runs as ${_user} user to increase security."
 	echo "Use the ${_game} script under /usr/bin/${_game}d to start, stop or backup the server."
 	echo "Adjust the configuration file under /etc/conf.d/${_game} to your liking."
@@ -11,6 +13,8 @@ post_install() {
 }
 
 post_upgrade() {
+	chown -R "${user}:${user}" "$_server_root"
+	
 	echo "The management script switched from GNU screen to tmux."
 	echo "Manual intervention is needed to close the previous GNU screen sessions:"
 	echo "Use \`sudo -u ${_user} screen -S ${_game} -rx\` to attach to the ${_game} session and stop it."