summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrent s2017-04-15 08:27:43 -0400
committerbrent s2017-04-15 08:27:43 -0400
commitb437e79e8a9014a5a875b232f3a42847f32a4e62 (patch)
tree54f89f77693cbc3c2324326ae3fbf2fcfa5bef38
parent8d5a05e2d84a794b274425d0cbceaf880358d366 (diff)
downloadaur-nquakesv.tar.gz
k, we should at the least be compatible with upstream nquakesv now...
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD8
-rw-r--r--README.arch34
-rw-r--r--README.arch.sigbin566 -> 566 bytes
-rwxr-xr-xnquakesv-init.py23
-rw-r--r--nquakesv-init.py.sigbin566 -> 565 bytes
6 files changed, 45 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f7781b873bd..dc97e49807b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Apr 15 11:50:42 UTC 2017
+# Sat Apr 15 12:27:43 UTC 2017
pkgbase = nquakesv
pkgdesc = The easiest, quickest, and most popular QuakeWorld server.
pkgver = 1.4
@@ -14,10 +14,10 @@ pkgbase = nquakesv
depends = python
noextract = qsw106.zip
noextract = sv-bin-x.zip
- source = http://fnu.nquake.com/sv-gpl.zip
- source = http://fnu.nquake.com/sv-non-gpl.zip
- source = http://fnu.nquake.com/qsw106.zip
- source = http://fnu.nquake.com/sv-configs.zip
+ source = http://quakeservers.nquake.com/sv-gpl.zip
+ source = http://quakeservers.nquake.com/sv-non-gpl.zip
+ source = http://quakeservers.nquake.com/qsw106.zip
+ source = http://quakeservers.nquake.com/sv-configs.zip
source = CC0-1.0::https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt
source = nquakesv.run
source = README.arch
@@ -42,10 +42,10 @@ pkgbase = nquakesv
sha512sums = 93d6879712f7bdd56e3ab8f018810bb66a2d4d89e7dfcabf53668eaf23dd984959a1fbe4ecaa743e98b9be2b65de5b2746529b195c78b0c1ff0996e32d8fdd1b
sha512sums = 1eb4436f8d58766cbe99db97e5e8c0db8a706376afd291c337de1ba7a6b066d3791dc85ad034bdd54ea336bed6e6e8e7a037d8b04b2773c9c7517b9d9921d1fa
sha512sums = 61fdec91aeee6b773d451b7407bca55fba5cd152654385b208c9a63c4e92c9f3fba2d8ad45b09585134ba5e1e7f6796c4ad706e5e564bbf3617026994cf30822
- sha512sums = b083d3884c9885ab402e58c95ec3b5288ee06afce2bab83af1610c9d2ee174ce7b77748647499cb82d9a3f4686d936e9a91b5feccae0818addd236907952c3d1
+ sha512sums = 7b7b6286e77fbe03fee7e560757a06cfe05f050b2377b8e12e4c8f2e8462a539ed7ea0bcdb55bba93bdce081f446ea2a9849ff254fb92448a127a2b2edfbdd8b
sha512sums = 2bd1a5f1aaec1332f1812d416568f8cd6d1506166f6863743e5c66c83ad5cc74e2415470c28b9f75cb2e20f04c51b930474bbb8073f2f47cb63765cfb144fda3
sha512sums = 562b17c114f4bc92116acce9a41dbb3d1031ae4ab5ae844e42a61ad3304ae95c86c299069c34966681af44516b5c58b05133441715f2cf4234697a9b3f58c250
- sha512sums = 21d279b5494d2cd777693eade8dde35c5ba7a6dba395828153d1b390ee768fb3ccb57d4b9c4a1dd5bc47d061a3242d9d659c23f310360c76cff95962baaf9a86
+ sha512sums = 96de31ae55dd590b6052062630f620edce7259700e57204ad4396a745ba3f4b73402ad595121dca7f5e298d8de366cc38931b20b0717f2c3daf2de2ef3ed1dab
sha512sums = f78b53dd916c4dc93967d33d03c6391754a0a9b5e6618a0985846a9b55971828f3367cf43154d18456b64ff4add42d9a3dbf84be0d46696fe7a51651d2b1c58d
sha512sums = SKIP
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 438e39c8668d..dc345056e752 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,8 +26,8 @@ _pkgname=nquake
_alt_pkgver=$(echo ${pkgver} | sed -e 's/\.//g')
# http://nquake.sourceforge.net/nquake.ini for list of mirrors
-#_nQ_MIRROR="http://quakeservers.nquake.com" # NL
-_nQ_MIRROR="http://fnu.nquake.com" # Uppsala, SE
+_nQ_MIRROR="http://quakeservers.nquake.com" # NL
+#_nQ_MIRROR="http://fnu.nquake.com" # Uppsala, SE
#_nQ_MIRROR="http://quake.tdhack.com/nquake" # FR
#_nQ_MIRROR="http://nquake.quake1.de" # DE
@@ -76,10 +76,10 @@ sha512sums=('6a07601f56aec5d88b3463c09c4482a2d76e5d7efd8ddc24c1b4e9b662152f62070
'93d6879712f7bdd56e3ab8f018810bb66a2d4d89e7dfcabf53668eaf23dd984959a1fbe4ecaa743e98b9be2b65de5b2746529b195c78b0c1ff0996e32d8fdd1b' # sv-configs.zip
'1eb4436f8d58766cbe99db97e5e8c0db8a706376afd291c337de1ba7a6b066d3791dc85ad034bdd54ea336bed6e6e8e7a037d8b04b2773c9c7517b9d9921d1fa' # CC0-1.0
'61fdec91aeee6b773d451b7407bca55fba5cd152654385b208c9a63c4e92c9f3fba2d8ad45b09585134ba5e1e7f6796c4ad706e5e564bbf3617026994cf30822' # nquakesv.run
- 'b083d3884c9885ab402e58c95ec3b5288ee06afce2bab83af1610c9d2ee174ce7b77748647499cb82d9a3f4686d936e9a91b5feccae0818addd236907952c3d1' # README.arch
+ '7b7b6286e77fbe03fee7e560757a06cfe05f050b2377b8e12e4c8f2e8462a539ed7ea0bcdb55bba93bdce081f446ea2a9849ff254fb92448a127a2b2edfbdd8b' # README.arch
'2bd1a5f1aaec1332f1812d416568f8cd6d1506166f6863743e5c66c83ad5cc74e2415470c28b9f75cb2e20f04c51b930474bbb8073f2f47cb63765cfb144fda3' # dirtree.lst
'562b17c114f4bc92116acce9a41dbb3d1031ae4ab5ae844e42a61ad3304ae95c86c299069c34966681af44516b5c58b05133441715f2cf4234697a9b3f58c250' # linktree.lst
- '21d279b5494d2cd777693eade8dde35c5ba7a6dba395828153d1b390ee768fb3ccb57d4b9c4a1dd5bc47d061a3242d9d659c23f310360c76cff95962baaf9a86' # nquakesv-init.py
+ '96de31ae55dd590b6052062630f620edce7259700e57204ad4396a745ba3f4b73402ad595121dca7f5e298d8de366cc38931b20b0717f2c3daf2de2ef3ed1dab' # nquakesv-init.py
'f78b53dd916c4dc93967d33d03c6391754a0a9b5e6618a0985846a9b55971828f3367cf43154d18456b64ff4add42d9a3dbf84be0d46696fe7a51651d2b1c58d' # nquakesv@.service
'SKIP' # onwards are .sig files
'SKIP'
diff --git a/README.arch b/README.arch
index c656b2d6d428..f83f03f3be35 100644
--- a/README.arch
+++ b/README.arch
@@ -1,27 +1,15 @@
-In order to use nquakesv under Arch Linux, you need to create a ~/.nquakesv directory with the following structure:
-
-~/.nquakesv/
-├── id1
-│   └── maps
-├── ktx
-│   ├── demos
-│   ├── modes
-│   ├── progs
-│   └── sound
-│   ├── misc
-│   ├── ra
-│   ├── rune
-│   └── weapons
-├── logs
-├── qtv
-│   └── levelshots
-├── qw
-│   └── maps
-│   └── ctf
-└── qwfwd.d
-
-This can be set up automatically by running /usr/bin/nquakesv-init. This is the recommended way as it will create necessary symlinks from the ezquake install as well.
+In order to use nquakesv under Arch Linux, you need to create a ~/.nquakesv directory with various symlinks to the actual data files.
+This can be automatically created by running /usr/bin/nquakesv-init. It is advised to copy the retail pak1.pak to /opt/quake/id1/ first; if not,
+you will need to copy it to ~/.nquakesv/id1/ later.
Note that if you wish nquakesv to start on boot, you will need to use a sliced systemd unit:
systemctl enable nquakesv@<username>.service
+
+However, this by default starts game mode ktx. If you wish to change the commandline arguments, you can create a modified version.
+For example, as root,
+
+cp /usr/lib/systemd/system/nquakesv\@.service /etc/systemd/system/nquakesv-ctf\@.service
+sed -i -e 's/ktx/ctf/g' /etc/systemd/system/nquakesv-ctf\@.service
+systemctl daemon-reload
+systemctl enable nquakesv-ctf@<username>.service
diff --git a/README.arch.sig b/README.arch.sig
index 56cc71494602..b4d8d0b68073 100644
--- a/README.arch.sig
+++ b/README.arch.sig
Binary files differ
diff --git a/nquakesv-init.py b/nquakesv-init.py
index c042f8b93d07..0b6dbcb12414 100755
--- a/nquakesv-init.py
+++ b/nquakesv-init.py
@@ -10,6 +10,7 @@ import pwd
import datetime
import json
import subprocess
+from urllib.request import urlopen
timestamp = datetime.datetime.now().strftime('%Y.%m.%d_%H%M.%S')
user = pwd.getpwuid(os.geteuid()).pw_name
@@ -71,8 +72,29 @@ def buildRootTree(ver = False):
if os.path.isdir(nquakedir):
os.rename(nquakedir, '{0}.bak_{1}'.format(nquakedir, timestamp))
os.makedirs(nquakedir, exist_ok = True)
+ # Some meta information
with open(nquakedir + '/VERSION', 'w') as f:
f.write('Generated on nquakesv package version {0}\n'.format(ver))
+ with open(nquakedir + '/admin', 'w') as f:
+ f.write(user + '\n')
+ with urlopen('https://ipinfo.io/ip') as ipfetch:
+ ipaddr = ipfetch.read().decode('utf-8')
+ with open(nquakedir + '/hostdns', 'w') as f:
+ f.write(ipaddr)
+ with open(nquakedir + '/ip', 'w') as f:
+ f.write(ipaddr)
+ with open(nquakedir + '/hostname', 'w') as f:
+ f.write('nQuake running on Arch Linux\n')
+ with open(nquakedir + '/install_dir', 'w') as f:
+ f.write(nquakedir + '\n')
+ with open(nquakedir + '/README', 'w') as f:
+ f.write("""Please review the following files in this directory to ensure that they contain the correct information.
+ admin - your name and contact info. Typically, this is in the form of: Handle (email@address.tld)
+ hostdns - the DNS entry of your server. If you don't have one, just map this to your external IP address.
+ hostname - the name used for server browsers.
+ install_dir - leave this unchanged.
+ ip - your external/WAN-accessible IP address.""")
+ f.write('\n\nNote that these files are not used by default, but are compatible with the upstream nquakesv scripts- so if you opt to use them, you can.\n')
# Generated from a vanilla from-"source" nquakesv install
# and generated by running the following inside the directory:
# find ./ -type d -printf "%P\n" | sed -e '/^$/d' | sort
@@ -112,6 +134,7 @@ def buildRootTree(ver = False):
def main():
buildRootTree()
populateTree()
+ print('Setup has completed successfully. Please review ~/.nquakesv/README')
if __name__ == '__main__':
main()
diff --git a/nquakesv-init.py.sig b/nquakesv-init.py.sig
index 041c22b2397f..b16b067a9ddd 100644
--- a/nquakesv-init.py.sig
+++ b/nquakesv-init.py.sig
Binary files differ