prs-git 0.3.5

2 files changed, 32 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c29322e66cc..146216315a16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = prs-git
 	pkgdesc = Secure, fast & convenient password manager CLI using GPG and git to sync (git)
-	pkgver = 0.3.2.r0.gac76409
+	pkgver = 0.3.5.r0.gbb316c8
 	pkgrel = 1
 	url = https://gitlab.com/timvisee/prs
-	arch = any
+	arch = x86_64
+	arch = i686
 	license = GPL3
-	makedepends = rust
+	makedepends = cargo
 	makedepends = python
 	makedepends = git
 	depends = gpgme
@@ -13,7 +14,7 @@ pkgbase = prs-git
 	depends = libxcb
 	depends = libxkbcommon
 	depends = skim
-	depends = tomb
+	optdepends = tomb: password store Tomb support
 	provides = prs
 	conflicts = prs
 	source = git+https://gitlab.com/timvisee/prs
diff --git a/PKGBUILD b/PKGBUILD
index 69ff4a3811da..be1c5e3dd61d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,15 @@
 # See: https://gitlab.com/timvisee/prs/-/tree/master/pkg/aur/prs-git
 
 pkgname=prs-git
-pkgver=0.3.2.r0.gac76409
+pkgver=0.3.5.r0.gbb316c8
 pkgrel=1
 pkgdesc="Secure, fast & convenient password manager CLI using GPG and git to sync (git)"
-arch=('any')
+arch=('x86_64' 'i686')
 url="https://gitlab.com/timvisee/prs"
 license=('GPL3')
-depends=('gpgme' 'dbus' 'libxcb' 'libxkbcommon' 'skim' 'tomb')
-makedepends=('rust' 'python' 'git')
+depends=('gpgme' 'dbus' 'libxcb' 'libxkbcommon' 'skim')
+makedepends=('cargo' 'python' 'git')
+optdepends=('tomb: password store Tomb support')
 conflicts=("${pkgname%-git}")
 provides=("${pkgname%-git}")
 source=("git+${url}")
@@ -20,22 +21,35 @@ sha512sums=('SKIP')
 _prs_cli_features=alias,clipboard,notify,backend-gpgme,select-skim-bin,tomb
 
 pkgver() {
-  cd "${pkgname%-git}"
-  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "${pkgname%-git}"
+
+    git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+    cd "${pkgname%-git}"
+
+    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-  cd "${pkgname%-git}"
-  cargo build --package prs-cli --no-default-features --features $_prs_cli_features --release --locked
+    cd "${pkgname%-git}"
+
+    export RUSTUP_TOOLCHAIN=stable
+    export CARGO_TARGET_DIR=target
+    cargo build --frozen --release --package prs-cli --no-default-features --features $_prs_cli_features
 }
 
 check() {
-  cd "${pkgname%-git}"
-  cargo test --package prs-cli --no-default-features --features $_prs_cli_features --release --locked
+    cd "${pkgname%-git}"
+
+    export RUSTUP_TOOLCHAIN=stable
+    cargo test --frozen --package prs-cli --no-default-features --features $_prs_cli_features
 }
 
 package() {
-  cd "${pkgname%-git}"
-  install -Dm 755 "target/release/${pkgname%-git}" -t "${pkgdir}/usr/bin"
-  install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname"
+    cd "${pkgname%-git}"
+
+    install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/${pkgname%-git}"
+    install -Dm0644 README.md -t "$pkgdir/usr/share/doc/${pkgname%-git}"
 }