Fix service file, and improve formatting of PKGBUILD

3 files changed, 57 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b66bdc049482..695b851d8263 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mautrix-signal
 	pkgdesc = A Matrix-Signal puppeting bridge
-	pkgver = 0.4.2
-	pkgrel = 1
+	pkgver = 0.4.3
+	pkgrel = 2
 	url = https://github.com/mautrix/signal
 	install = mautrix-signal.install
 	arch = any
@@ -27,12 +27,12 @@ pkgbase = mautrix-signal
 	optdepends = python-unpaddedbase64: end-to-bridge encryption support
 	backup = etc/mautrix-signal/config.yaml
 	backup = etc/mautrix-signal/registration.yaml
-	source = https://github.com/mautrix/signal/archive/refs/tags/v0.4.2.tar.gz
+	source = https://github.com/mautrix/signal/archive/refs/tags/v0.4.3.tar.gz
 	source = mautrix-signal.service
 	source = mautrix-signal.sysusers
 	source = mautrix-signal.tmpfiles
-	sha256sums = bd6c537b2dae759b13ad2acdc49e76f6b9b14ce6c7f234aa6f8f7966293a1a87
-	sha256sums = 87a479c5216fa79dbe20ff776f67f5ab70ad0f9705da4b274cc662003545c4be
+	sha256sums = e75636e845d4b9d84070efec510b7358b93a4fb0d6ffe4300dbdb9260725ba53
+	sha256sums = 8990ebe7df080cd6eddd5af17b49dbf4c4b5e5216b8211b5afc9cf096f38cd5f
 	sha256sums = 3203dcff48579a2420eff4289a03ea1b3a9f47031c39f514e8c9a2d119625725
 	sha256sums = 5badc8727dfbf4531f93e86ae475c64753952ee60090a043be22b9dd9a124ca5
 
diff --git a/PKGBUILD b/PKGBUILD
index 787e22388d26..5953af020367 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,69 +1,77 @@
 # Maintainer: Mark Collins < tera_1225 hat hotmail dote com>
 # Contributor: Frédéric Tobias Christ <dev+mautrix-signal@ntr.li> <ftchrist:matrix.org>
 pkgname='mautrix-signal'
-pkgver=0.4.2
-pkgrel=1
+pkgver=0.4.3
+pkgrel=2
 pkgdesc="A Matrix-Signal puppeting bridge"
 arch=('any')
 url="https://github.com/mautrix/signal"
 license=('AGPLv3')
 depends=(
-'python-aiohttp'
-'python-asyncpg'
-'python-attrs'
-'python-commonmark'
-'python-mautrix'
-'python-magic'
-'python-ruamel-yaml'
-'python-yarl' 
-'signald' )
+  'python-aiohttp'
+  'python-asyncpg'
+  'python-attrs'
+  'python-commonmark'
+  'python-mautrix'
+  'python-magic'
+  'python-ruamel-yaml'
+  'python-yarl' 
+  'signald'
+)
 makedepends=('python-setuptools')
-#checkdepends
 optdepends=(
-'python-aiosqlite: Support for SQLite-Database '
-'python-olm: end-to-bridge encryption support'
-'python-phonenumbers: Formatted phone numbers'
-'python-pillow: webp conversion and qr code login'
-'python-prometheus_client: metrics upload'
-'python-pycryptodome'
-'python-qrcode: qr code login'
-'python-signalstickers-client'
-'python-unpaddedbase64: end-to-bridge encryption support')
+  'python-aiosqlite: Support for SQLite-Database '
+  'python-olm: end-to-bridge encryption support'
+  'python-phonenumbers: Formatted phone numbers'
+  'python-pillow: webp conversion and qr code login'
+  'python-prometheus_client: metrics upload'
+  'python-pycryptodome'
+  'python-qrcode: qr code login'
+  'python-signalstickers-client'
+  'python-unpaddedbase64: end-to-bridge encryption support'
+)
 backup=(
-    "etc/${pkgname}/config.yaml"
-    "etc/${pkgname}/registration.yaml"
-    )
+  "etc/${pkgname}/config.yaml"
+  "etc/${pkgname}/registration.yaml"
+)
 install="${pkgname}.install"
-source=( "${url}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.service" "${pkgname}.sysusers" "${pkgname}.tmpfiles")
-sha256sums=('bd6c537b2dae759b13ad2acdc49e76f6b9b14ce6c7f234aa6f8f7966293a1a87'
-            '87a479c5216fa79dbe20ff776f67f5ab70ad0f9705da4b274cc662003545c4be'
+source=(
+  "${url}/archive/refs/tags/v${pkgver}.tar.gz"
+  "${pkgname}.service"
+  "${pkgname}.sysusers"
+  "${pkgname}.tmpfiles"
+)
+sha256sums=('e75636e845d4b9d84070efec510b7358b93a4fb0d6ffe4300dbdb9260725ba53'
+            '8990ebe7df080cd6eddd5af17b49dbf4c4b5e5216b8211b5afc9cf096f38cd5f'
             '3203dcff48579a2420eff4289a03ea1b3a9f47031c39f514e8c9a2d119625725'
             '5badc8727dfbf4531f93e86ae475c64753952ee60090a043be22b9dd9a124ca5')
 
 prepare() {
-    mv "${srcdir}/signal-${pkgver}" "${srcdir}/${pkgname}-${pkgver}"
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    touch registration.yaml
+  mv "${srcdir}/signal-${pkgver}" "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  touch registration.yaml
     
-    # Adapt signald paths for convenience
-    sed -i "s|~/.config/signald/avatars|/var/lib/signald/avatars|g" mautrix_signal/example-config.yaml
-    sed -i "s|~/.config/signald/data|/var/lib/signald/data|g" mautrix_signal/example-config.yaml
+  # Adapt signald paths for convenience
+  sed -i "s|~/.config/signald/avatars|/var/lib/signald/avatars|g" mautrix_signal/example-config.yaml
+  sed -i "s|~/.config/signald/data|/var/lib/signald/data|g" mautrix_signal/example-config.yaml
 }
+
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    python setup.py build
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python setup.py build
 }
+
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-    _shared_dir="/usr/share/${pkgname}"
+  _shared_dir="/usr/share/${pkgname}"
 
-    python setup.py install --optimize=1 --skip-build --root="${pkgdir}/" --prefix="/usr" --install-data="${_shared_dir}"
+  python setup.py install --optimize=1 --skip-build --root="${pkgdir}/" --prefix="/usr" --install-data="${_shared_dir}"
 
-    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 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}${_shared_dir}/example-config.yaml" "${pkgdir}/etc/${pkgname}/config.yaml"
-	install -Dvm 640 registration.yaml "${pkgdir}/etc/${pkgname}/registration.yaml"
+  install -Dvm 640 "${pkgdir}${_shared_dir}/example-config.yaml" "${pkgdir}/etc/${pkgname}/config.yaml"
+  install -Dvm 640 registration.yaml "${pkgdir}/etc/${pkgname}/registration.yaml"
 }
diff --git a/mautrix-signal.service b/mautrix-signal.service
index 0e0cddc9c3a1..72cd2e544fe1 100644
--- a/mautrix-signal.service
+++ b/mautrix-signal.service
@@ -6,7 +6,7 @@ Requires=network-online.target
 [Service]
 User=mautrix-signal
 WorkingDirectory=~
-ExecStart=python -m mautrix_signal -b /usr/share/mautrix-signal/example-config.yaml -c /etc/mautrix-signal/config.yaml -r /etc/mautrix-signal/registration.yaml
+ExecStart=python -m mautrix_signal -c /etc/mautrix-signal/config.yaml -r /etc/mautrix-signal/registration.yaml
 
 Restart=on-failure
 RestartSec=30s