summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrainDamage2020-11-09 18:14:47 +0100
committerBrainDamage2020-11-09 18:14:47 +0100
commitabb8dc7b058d1923bb6b2fc4c6c7636a602aeece (patch)
tree76010c0081134bb61e1a9938efc3a78295bd6dfb
parent685c465c4e96f1311c3d2145c6b9ebafe76a536a (diff)
downloadaur-abb8dc7b058d1923bb6b2fc4c6c7636a602aeece.tar.gz
less code duplication
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 569e5c1a9fcc..b08f0095b244 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mautrix-telegram
pkgdesc = A Matrix-Telegram hybrid puppeting/relaybot bridge.
pkgver = 0.8.2
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/tulir/mautrix-telegram
arch = any
license = AGPLv3
diff --git a/PKGBUILD b/PKGBUILD
index e77fa7948edd..ee541dcccf90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: BrainDamage
pkgname=mautrix-telegram
pkgver=0.8.2
-pkgrel=2
+pkgrel=3
pkgdesc="A Matrix-Telegram hybrid puppeting/relaybot bridge."
url="https://github.com/tulir/mautrix-telegram"
depends=('python' 'python-sqlalchemy' 'python-alembic' 'python-ruamel-yaml'
@@ -43,6 +43,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ _shared_dir="/usr/share/${pkgname}"
python setup.py install --optimize=1 --skip-build --root="${pkgdir}/" --prefix="/usr"
# it's a semi-common failure for python packages to install tests in the main dir
@@ -50,17 +51,16 @@ package() {
rm -rf "${pkgdir}$(python -c 'import site; print(site.getsitepackages()[0])')/tests"
# TODO: remove this junk when ver 9 gets out of rc since it has a param data_files to chose the path
- _shared_dir="/usr/share/${pkgname}"
mkdir -p "${pkgdir}${_shared_dir}"
mv "${pkgdir}/usr/"{alembic,alembic.ini} "${pkgdir}/${_shared_dir}"
mv "${pkgdir}$(python -c 'import site; print(site.getsitepackages()[0])')/${pkgname//-/_}/example-config.yaml" "${pkgdir}${_shared_dir}"
# adjust alembic script dir location so that by using an abs path it can be used in CWD
- sed -i -e "s|script_location = alembic|script_location = /usr/share/${pkgname}/alembic/|" "${pkgdir}/usr/share/${pkgname}/alembic.ini"
+ sed -i -e "s|script_location = alembic|script_location = ${_shared_dir}/alembic/|" "${pkgdir}${_shared_dir}/alembic.ini"
install -Dvm 644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
install -Dvm 644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
install -Dvm 644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
- install -Dvm 640 "${pkgdir}/usr/share/${pkgname}/example-config.yaml" "${pkgdir}/etc/${pkgname}/config.yaml"
+ install -Dvm 640 "${pkgdir}${_shared_dir}/example-config.yaml" "${pkgdir}/etc/${pkgname}/config.yaml"
}