summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Fontenelle2021-03-26 02:25:48 -0300
committerRafael Fontenelle2021-03-26 02:25:48 -0300
commit48f2addc8d55eb26a89838a5cf6f3f5a69a6de0b (patch)
tree6b6b6e275e2c90616f86ce18884bb3a67a8fcddc
parent7b95b8e90ee2d0993d3424f005f51ac1924f926b (diff)
downloadaur-ddnet-maps-git.tar.gz
Fix conflict with ddnet
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cd9aba6b710..a960761db6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = ddnet-maps-git
pkgdesc = All released maps with configs for DDraceNetwork server
- pkgver = r1387.gb0700637
+ pkgver = r1405.g0cb6a2e4
pkgrel = 1
url = https://ddnet.tw
arch = any
license = custom
makedepends = git
- backup = usr/share/ddnet/data/autoexec_server.cfg
+ backup = usr/share/ddnet/data/autoexec_server_maps.cfg
backup = usr/share/ddnet/data/reset.cfg
backup = usr/share/ddnet/data/storage.cfg
source = git+https://github.com/ddnet/ddnet-maps.git
diff --git a/PKGBUILD b/PKGBUILD
index e506b6bee50..227dac2c2f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
# Maintainer: Edgar Luque <git@edgarluque.com>
pkgname=ddnet-maps-git
-pkgver=r1387.gb0700637
+pkgver=r1405.g0cb6a2e4
pkgrel=1
pkgdesc="All released maps with configs for DDraceNetwork server"
arch=(any)
url="https://ddnet.tw"
license=('custom')
makedepends=('git')
-backup=('usr/share/ddnet/data/autoexec_server.cfg'
+backup=('usr/share/ddnet/data/autoexec_server_maps.cfg'
'usr/share/ddnet/data/reset.cfg'
'usr/share/ddnet/data/storage.cfg')
source=("git+https://github.com/ddnet/${pkgname%%-git}.git")
@@ -36,12 +36,13 @@ package() {
_datadir="$pkgdir/usr/share/ddnet/data"
install -d -m755 $_datadir/{maps,types}
- install -m644 autoexec_server.cfg $_datadir
+ # Rename autoexec_server.cfg to avoid conflict with 'ddnet' package
+ install -m644 autoexec_server.cfg $_datadir/autoexec_server_maps.cfg
install -m644 reset.cfg $_datadir
install -m644 storage.cfg $_datadir
# Disable test flag
- sed '/sv_test_cmds/s/1/0/' -i $_datadir/autoexec_server.cfg
+ sed '/sv_test_cmds/s/1/0/' -i $_datadir/autoexec_server_maps.cfg
# Set map type list, and fail if no map type is found
_typelist=$(ls -d types/* | sed 's|.*/||')