change build process to match best practices (see wiki)

2 files changed, 9 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b98d9816b26b..38501a10f5f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nextcloud-app-notify_push
 	pkgdesc = Update notifications for nextcloud clients
 	pkgver = 0.2.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/nextcloud/notify_push
 	install = nextcloud-app-notify_push.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 1c7889369a57..5478977ddb82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _appname=notify_push
 pkgname=nextcloud-app-notify_push
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Update notifications for nextcloud clients"
 arch=("x86_64")
 url="https://github.com/nextcloud/notify_push"
@@ -16,22 +16,24 @@ source=("$_appname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
         "$pkgname.service")
 sha512sums=('716d1e53da408e243e7cae7813ac3ffc3b66a1088b64c36b00ad821ab526787e9fe3cb379b2d70959b596a94d9913b9328e5d0da4d58e4f0565bb2227df80712'
             '1fe68df3a84770dfc708f1ad8fdf8077e45ea08e5312a5efbe5c4baa310bd4f926e793825c259a31398dc29dbf76ec47943d60aa386f9d64d880737be4004c16')
-_target=$CARCH-unknown-linux-gnu
 
 prepare() {
     sed -i "s/ARCH/$CARCH/" "$pkgname.service"
     cd "$_appname-$pkgver"
-    cargo fetch --locked --target $_target
+    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
     cd "$_appname-$pkgver"
-    cargo build --release --locked --all-features --target-dir=../target
+    export RUSTUP_TOOLCHAIN=stable
+    export CARGO_TARGET_DIR=target
+    cargo build --frozen --release --all-features
 }
 
 check() {
     cd "$_appname-$pkgver"
-    cargo test --release --locked --target-dir=../target -- --test-threads 1
+    export RUSTUP_TOOLCHAIN=stable
+    cargo test --frozen --all-features -- --test-threads 1
 }
 
 package() {
@@ -43,6 +45,6 @@ package() {
     do
         rm -rf -- "$_appdir"/$f
     done < .nextcloudignore
-    install -m 755 -Dt "$_appdir/bin/$CARCH/" ../target/release/notify_push
+    install -m 755 -Dt "$_appdir/bin/$CARCH/" target/release/notify_push
     install -m 644 -Dt "$pkgdir/usr/lib/systemd/system/" "$srcdir/$pkgname.service"
 }