shit, i need to re-do this as a flat list, not json.

1 files changed, 54 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b116054ad829..1f6952e0c199 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,11 +11,11 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 
 pkgname=('nquakesv')
 pkgver=1.4
-pkgrel=1
+pkgrel=3
 pkgdesc="The easiest, quickest, and most popular QuakeWorld server."
 url="http://nquake.com/"
 license=('GPL2' 'custom')
-depends=('unzip' 'ezquake')
+depends=('unzip' 'ezquake' 'python')
 conflicts=('nquake')
 arch=('any')
 install=nquakesv.install
@@ -32,13 +32,17 @@ _nQ_MIRROR="http://fnu.nquake.com" # Uppsala, SE
 source=("${_nQ_MIRROR}/sv-gpl.zip"
 	"${_nQ_MIRROR}/sv-non-gpl.zip"
 	"${_nQ_MIRROR}/qsw106.zip"
+	"${_nQ_MIRROR}/sv-configs.zip"
 	"CC0-1.0::https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt"
 	"nquakesv.run"
+	"README.arch"
 	"sv-gpl.zip.sig"
 	"sv-non-gpl.zip.sig"
 	"CC0-1.0.sig"
 	"qsw106.zip.sig"
-	"nquakesv.run.sig")
+	"sv-configs.zip.sig"
+	"nquakesv.run.sig"
+	"README.arch.sig")
 
 source_x86_64=("${_nQ_MIRROR}/sv-bin-x64.zip"
 	       "sv-bin-x64.zip.sig")
@@ -59,8 +63,12 @@ noextract=('qsw106.zip'
 sha512sums=('6a07601f56aec5d88b3463c09c4482a2d76e5d7efd8ddc24c1b4e9b662152f62070dbb5409c1a801560872c725b5b8b1d41437b7b99c74bdcc1ae88d2be91121'
 	    '21e6ef7a58c03e342b501a345fd777472b9d109a95201fa859c99d626845d01cf90d0ce6c42f76f5878795f1bcd549128250b9f8e82fceedb8b1f6534b9a1e32'
 	    '32df717a4a8f121358243333c30d8d0e5d43ee04f3ee8175a894199b8932e90ebedc6b687c25207c6191dbf25363307f09f8c1dc767b58e254e015c150217384'
+	    '93d6879712f7bdd56e3ab8f018810bb66a2d4d89e7dfcabf53668eaf23dd984959a1fbe4ecaa743e98b9be2b65de5b2746529b195c78b0c1ff0996e32d8fdd1b'
 	    '1eb4436f8d58766cbe99db97e5e8c0db8a706376afd291c337de1ba7a6b066d3791dc85ad034bdd54ea336bed6e6e8e7a037d8b04b2773c9c7517b9d9921d1fa'
 	    'e7dac93556d63c994d37f2361a48408c924426b81395cacb3229acb3020df66dce62e5734686fba44cc7581567e28e5345f6d7a5638c0c97b8effdab78756111'
+	    'b083d3884c9885ab402e58c95ec3b5288ee06afce2bab83af1610c9d2ee174ce7b77748647499cb82d9a3f4686d936e9a91b5feccae0818addd236907952c3d1'
+	    'SKIP'
+	    'SKIP'
 	    'SKIP'
 	    'SKIP'
 	    'SKIP'
@@ -73,48 +81,57 @@ sha512sums_i686=('c4b32e5f409a603adea54206b0ebbebb1b7907d7a56065e7730ca01931de33
                  'SKIP')
 
 prepare () {
-	unzip -j "qsw106.zip" "ID1/PAK0.PAK"
-        unzip -j "qsw106.zip" "LICINFO.TXT"
-        unzip -j "qsw106.zip" "README.TXT"
-        unzip -j "qsw106.zip" "SLICNSE.TXT"
+	unzip -o -j "qsw106.zip" "ID1/PAK0.PAK"
+        unzip -o -j "qsw106.zip" "LICINFO.TXT"
+        unzip -o -j "qsw106.zip" "README.TXT"
+        unzip -o -j "qsw106.zip" "SLICNSE.TXT"
 	# Necessary because bsdtar's absolutely silly and keeps trying to extract the contents of the extracted zip or something. friggin' pacman.
-	unzip sv-bin-x${BITNESS}.zip
+	unzip -o sv-bin-x${BITNESS}.zip
 }
 
 package () {
-echo pkg
 ### BASE ##
 	# Most of these files are in gpl.zip
 	install -d -m 0750 ${pkgdir}/opt/quake/{id1,qw}
-	install -d -m 0750 ${pkgdir}/usr/share/nquake
-	install -d -m 0750 ${pkgdir}/usr/share/doc/nquake
-	install -d -m 0750 ${pkgdir}/usr/share/licenses/nquake
+	install -d -m 0750 ${pkgdir}/usr/share/${pkgname}
+	install -d -m 0750 ${pkgdir}/usr/share/doc/${pkgname}
+	install -d -m 0750 ${pkgdir}/usr/share/licenses/${pkgname}
 	install -d -m 0755 ${pkgdir}/usr/bin
-	# Fix ezquake packages.
-	install -d -m 0770 ${pkgdir}/opt/quake/ezquake/{sb/cache,temp}
 	# Implement the following in ezQuake
 	#chgrp games ${pkgdir}/usr/bin/ezquake
 	#chmod 0750 ${pkgdir}/usr/bin/ezquake
 
 	# And the Business-End(TM). Do the thing.
-	install -D -m 0775 ${srcdir}/nquakesv.run ${pkgdir}/usr/bin/nquakesv
-	install -D -m 0775 ${srcdir}/mvdsv ${pkgdir}/opt/quake/mvdsv
-	install -D -m 0775 ${srcdir}/qwfwd/qwfwd.bin ${pkgdir}/opt/quake/qwfwd
-	install -D -m 0775 ${srcdir}/qtv/qtv.bin ${pkgdir}/opt/quake/quaketv
-	cp -a ${srcdir}/logs ${pkgdir}/opt/quake/.
+	install -D -m 0775 ${srcdir}/nquakesv.run ${pkgdir}/usr/bin/${pkgname}
+	install -D -m 0775 ${srcdir}/mvdsv ${pkgdir}/usr/share/${pkgname}/mvdsv
+	install -D -m 0775 ${srcdir}/qwfwd/qwfwd.bin ${pkgdir}/usr/share/${pkgname}/qwfwd
+	install -D -m 0775 ${srcdir}/qtv/qtv.bin ${pkgdir}/usr/share/${pkgname}/quaketv
+	install -D -m 0644 ${srcdir}/README.arch ${pkgdir}/usr/share/doc/${pkgname}/README.arch
+	cp -a ${srcdir}/logs ${pkgdir}/usr/share/${pkgname}/.
 
 ## DEMO DATA ##
-	install -D -m 0644 ${srcdir}/PAK0.PAK ${pkgdir}/opt/quake/id1/pak0.pak
-        install -D -m 0644 ${srcdir}/LICINFO.TXT ${pkgdir}/usr/share/doc/nquake/quake_shareware_license_info.txt
-        install -D -m 0644 ${srcdir}/README.TXT ${pkgdir}/usr/share/doc/nquake/quake_shareware_readme.txt
-        install -D -m 0644 ${srcdir}/SLICNSE.TXT ${pkgdir}/usr/share/licenses/nquake/quake_shareware.txt
+	install -D -m 0644 ${srcdir}/PAK0.PAK ${pkgdir}/opt/quake/id1/pak0.pak.DEMO
+        install -D -m 0644 ${srcdir}/LICINFO.TXT ${pkgdir}/usr/share/doc/${pkgname}/quake_shareware_license_info.txt
+        install -D -m 0644 ${srcdir}/README.TXT ${pkgdir}/usr/share/doc/${pkgname}/quake_shareware_readme.txt
+        install -D -m 0644 ${srcdir}/SLICNSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/quake_shareware.txt
 
 ## NON-FREE ##
 	# Most of these files are in non-gpl.zip
-	install -d -m 0750 ${pkgdir}/opt/quake/qw/{maps}
-	cp -a ${srcdir}/CC0-1.0 ${pkgdir}/usr/share/licenses/${_pkgname}/.
+	install -d -m 0755 ${pkgdir}/usr/share/${pkgname}/qw/maps
+	cp -a ${srcdir}/qw/maps/* ${pkgdir}/usr/share/${pkgname}/qw/maps/.
+	install -D -m 0644 ${srcdir}/id1/maps/b_exbox2.bsp ${pkgdir}/usr/share/${pkgname}/id1/maps/b_exbox2.bsp
+	cp -a ${srcdir}/CC0-1.0 ${pkgdir}/usr/share/licenses/${pkgname}/.
 	# And the Business-End(TM). Do the thing.
-	cp -a ${srcdir}/README ${pkgdir}/usr/share/doc/nquake/readme.txt  # nQuake FAQ, credits, etc.
+	cp -a ${srcdir}/README ${pkgdir}/usr/share/doc/${pkgname}/readme.txt  # nQuake FAQ, credits, etc.
+	install -d -m 0755 ${pkgdir}/usr/share/${pkgname}/cfgs/
+	install -d -m 0755 ${pkgdir}/usr/share/${pkgname}/modes/
+	mv ${srcdir}/ktx/configs/* ${pkgdir}/usr/share/${pkgname}/cfgs/.
+	mv ${srcdir}/ktx/modes/* ${pkgdir}/usr/share/${pkgname}/modes/.
+	rmdir ${srcdir}/ktx/configs
+	mv ${srcdir}/ktx/mvdsv.cfg ${pkgdir}/usr/share/${pkgname}/cfgs/mvdsv-server.cfg
+	mv ${srcdir}/ktx/ktx.cfg ${pkgdir}/usr/share/${pkgname}/cfgs/ktx-server.cfg
+	mv ${srcdir}/ktx/matchless.cfg ${pkgdir}/usr/share/${pkgname}/cfgs/matchless-server.cfg
+	find ${pkgdir}/usr/share/${pkgname}/cfgs -type f -exec chmod 0644 '{}' \;
 
 ### FORTRESS ##
 # TODO
@@ -136,18 +153,23 @@ echo pkg
 #	cp -a ${srcdir}/prox ${pkgdir}/opt/quake/.  # QuakeProxy, I think?
 ## KTX ##
 	# Most of these files are in sv-gpl.zip and sv-non-gpl.zip. some are in sv-bin-x${BITNESS}.zip
-	cp -a ${srcdir}/ktx ${pkgdir}/opt/quake/.
+	cp -a ${srcdir}/ktx ${pkgdir}/usr/share/${pkgname}/.
+	# Let's clean up a bit.
+	for f in portx server pwd ban_ip vip_ip;
+	do
+		rm ${pkgdir}/usr/share/${pkgname}/ktx/${f}.cfg
+	done
 ## QTV ##
-	cp -a ${srcdir}/qtv/qtv ${pkgdir}/opt/quake/.
-	install -D -m 0644 ${srcdir}/qtv/qtv.cfg ${pkgdir}/opt/quake/qtv.cfg
+	cp -a ${srcdir}/qtv/qtv ${pkgdir}/usr/share/${pkgname}/.
+	install -D -m 0644 ${srcdir}/qtv/qtv.cfg ${pkgdir}/usr/share/${pkgname}/qtv/qtv.cfg
 ## QWFWD ##
-	install -D -m 0644 ${srcdir}/qwfwd/qwfwd.cfg ${pkgdir}/opt/quake/qwfwd.cfg
+	install -D -m 0644 ${srcdir}/qwfwd/qwfwd.cfg ${pkgdir}/usr/share/${pkgname}/qwfwd.d/qwfwd.cfg
 
 ## FINISHING TOUCHES ##
 	# Security is worthless without a modicum of usability. We're kind of stepping on other packagers' toes here, but... c'est la vie.
 	# Remind me to submit a patch to https://aur.archlinux.org/packages/ezquake/ (and incorporate into ezquake-git, which I maintain).
 	# Scratch that, ezquake uses "users" group. Works for me!
-	chgrp -R users ${pkgdir}/opt/quake/
-	chgrp users ${pkgdir}/usr/share/nquake
+	chgrp -R users ${pkgdir}/usr/share/${pkgname}/
+	chgrp users ${pkgdir}/usr/share/${pkgname}
 
 }