upgpkg: borgmatic 1.2.14-1

upstream release

Stop using sed to prepare borgmatic.service, as it can silently fail.

4 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a3ba99cc361..4778a5e2a61d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = borgmatic
 	pkgdesc = A wrapper script for Borg backup software that creates and prunes backups
-	pkgver = 1.2.4
+	pkgver = 1.2.14
 	pkgrel = 1
 	url = https://torsion.org/borgmatic/
 	install = borgmatic.install
@@ -12,10 +12,12 @@ pkgbase = borgmatic
 	depends = borg
 	depends = python-pykwalify
 	depends = python-ruamel-yaml
-	source = borgmatic-1.2.4.tar.gz::https://projects.torsion.org/witten/borgmatic/archive/1.2.4.tar.gz
+	source = borgmatic-1.2.14.tar.gz::https://projects.torsion.org/witten/borgmatic/archive/1.2.14.tar.gz
 	source = borgmatic.install
-	sha256sums = 139653a014e39b749234908153ed81a712753e92bd3419ec2f38f7898b452ab3
+	source = borgmatic.service
+	sha256sums = b77f8aff75208a69211d2453baf287001b4f54f858c56f8daba240461485d0f8
 	sha256sums = 2862763feea83e3ee0fb65c9f3fec648312486cd8ab48cd7cac70a7bb742b55b
+	sha256sums = 1b033f96dc7404c26fad0f5fbbdda2fd93959869a7737092049ed7cfe994602e
 
 pkgname = borgmatic
 
diff --git a/.gitignore b/.gitignore
index 793d8b6abe6b..4e2bc6d85f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 !.SRCINFO
 !.gitignore
 !PKGBUILD
-!*.install
+!borgmatic.install
+!borgmatic.service
diff --git a/PKGBUILD b/PKGBUILD
index 764ad6586416..f80a36d49b90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: stef204 <https://aur.archlinux.org/account/stef204>
 
 pkgname='borgmatic'
-pkgver=1.2.4
+pkgver=1.2.14
 pkgrel=1
 pkgdesc='A wrapper script for Borg backup software that creates and prunes backups'
 arch=('any')
@@ -16,22 +16,18 @@ install="${pkgname}.install"
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://projects.torsion.org/witten/borgmatic/archive/${pkgver}.tar.gz"
   "${pkgname}.install"
+  "${pkgname}.service"
 )
 sha256sums=(
-  '139653a014e39b749234908153ed81a712753e92bd3419ec2f38f7898b452ab3'
+  'b77f8aff75208a69211d2453baf287001b4f54f858c56f8daba240461485d0f8'
   '2862763feea83e3ee0fb65c9f3fec648312486cd8ab48cd7cac70a7bb742b55b'
+  '1b033f96dc7404c26fad0f5fbbdda2fd93959869a7737092049ed7cfe994602e'
 )
 
-prepare() {
-  cd "${pkgname}"
-
-  sed -i 's#/usr/local/bin/borgmatic#/usr/bin/borgmatic#' sample/systemd/borgmatic.service
-}
-
 check() {
   cd "${pkgname}"
 
-  pytest
+  pytest --ignore='./tests/end-to-end'
 }
 
 package() {
@@ -40,7 +36,7 @@ package() {
   python setup.py -q install --root="${pkgdir}" --optimize=1
   
   install -d "${pkgdir}/usr/lib/systemd/system"
-  install -m 644 sample/systemd/* "${pkgdir}/usr/lib/systemd/system/"
+  install -m 644 "${srcdir}/borgmatic.service" "${pkgdir}/usr/lib/systemd/system/"
   install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
diff --git a/borgmatic.service b/borgmatic.service
new file mode 100644
index 000000000000..d52f338d2e26
--- /dev/null
+++ b/borgmatic.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=borgmatic backup
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/borgmatic