summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Galindo2021-02-23 20:06:30 +0100
committerCarlos Galindo2021-02-23 20:06:30 +0100
commit132720933fb15e10f0b417923986c99af7ea1679 (patch)
treed25d79c231ea07558033dac69ec4338604be173b
parent91fe929ee0b90b9f900517abbd57a6f1cb1161d5 (diff)
downloadaur-132720933fb15e10f0b417923986c99af7ea1679.tar.gz
now should be valid for any architecture
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
-rw-r--r--nextcloud-app-notify_push.service (renamed from nextcloud-app-notify_push-x86_64.service)2
3 files changed, 11 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6fe957e65d63..a4aaa0028eaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,9 +10,9 @@ pkgbase = nextcloud-app-notify_push
depends = nextcloud>=21
optdepends = redis: use a local redis instance
source = notify_push-0.1.3.tar.gz::https://github.com/nextcloud/notify_push/archive/v0.1.3.tar.gz
+ source = nextcloud-app-notify_push.service
sha512sums = c0e62769ae3cfc2f1091a459278a5ae70e69b4b1d49cd60469c51f6cedc7a26402465fe1406cf5ad83f7270a45ed5d0938248e489173783dbe3f20c04c8c8cf1
- source_x86_64 = nextcloud-app-notify_push-x86_64.service
- sha512sums_x86_64 = be5b2e0fadaff8578882804a553a0da1c7305510548075dd06125832e88157adad4f15305aa3c6cfad9198bb8123d09706f19cfc77df8606bdd693ab240cb3aa
+ sha512sums = b1ca868d3345e7fea82128f6f193141a5401e20611e38fecbe7876e17b172668f11ce8bc9984a10c5582152b899d46606298cc24f721e251c015a5af6bc2a047
pkgname = nextcloud-app-notify_push
diff --git a/PKGBUILD b/PKGBUILD
index 103be0d56d0e..985d8928cba6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,13 +12,14 @@ makedepends=('rust')
checkdepends=()
optdepends=('redis: use a local redis instance')
install=nextcloud-app-notify_push.install
-source=("$_appname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-source_x86_64=("$pkgname-x86_64.service")
-sha512sums=('c0e62769ae3cfc2f1091a459278a5ae70e69b4b1d49cd60469c51f6cedc7a26402465fe1406cf5ad83f7270a45ed5d0938248e489173783dbe3f20c04c8c8cf1')
-sha512sums_x86_64=('be5b2e0fadaff8578882804a553a0da1c7305510548075dd06125832e88157adad4f15305aa3c6cfad9198bb8123d09706f19cfc77df8606bdd693ab240cb3aa')
-_target=$arch-unknown-linux-gnu
+source=("$_appname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+ "$pkgname.service")
+sha512sums=('c0e62769ae3cfc2f1091a459278a5ae70e69b4b1d49cd60469c51f6cedc7a26402465fe1406cf5ad83f7270a45ed5d0938248e489173783dbe3f20c04c8c8cf1'
+ 'b1ca868d3345e7fea82128f6f193141a5401e20611e38fecbe7876e17b172668f11ce8bc9984a10c5582152b899d46606298cc24f721e251c015a5af6bc2a047')
+_target=$CARCH-unknown-linux-gnu
prepare() {
+ sed -i "s/ARCH/$CARCH/" "$pkgname.service"
cd "$_appname-$pkgver"
cargo fetch --locked --target $_target
}
@@ -42,7 +43,6 @@ package() {
do
rm -rf -- "$_appdir"/$f
done < .nextcloudignore
- mkdir -p "$_appdir/bin/$arch"
- install -m 755 -t "$_appdir/bin/$arch/" target/release/notify_push
- install -m 644 -D "$srcdir/$pkgname-$arch.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ install -m 755 -Dt "$_appdir/bin/$CARCH/" target/release/notify_push
+ install -m 644 -Dt "$pkgdir/usr/lib/systemd/system/" "$srcdir/$pkgname.service"
}
diff --git a/nextcloud-app-notify_push-x86_64.service b/nextcloud-app-notify_push.service
index 106998f0529b..4c689241d4c3 100644
--- a/nextcloud-app-notify_push-x86_64.service
+++ b/nextcloud-app-notify_push.service
@@ -3,7 +3,7 @@ Description = Push daemon for Nextcloud clients
[Service]
Environment = PORT=7867
-ExecStart = /usr/share/webapps/nextcloud/apps/notify_push/bin/x86_64/notify_push /etc/webapps/nextcloud/config/config.php
+ExecStart = /usr/share/webapps/nextcloud/apps/notify_push/bin/ARCH/notify_push /etc/webapps/nextcloud/config/config.php
User = nextcloud
[Install]