Update cargo build steps

Fix arch, makedepends, pkgrel, pkgver, source.
Add check(), pkgver().
Change pkgdesc.

2 files changed, 33 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56cf45f3e6c7..822be5bd2c7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = wttrbar-git
-	pkgdesc = Weather indicator for Waybar
-	pkgver = 0.093c253
-	pkgrel = 0
+	pkgdesc = Show the weather in Waybar, using the great wttr.io
+	pkgver = 0.4.0.r0.gdfa1473
+	pkgrel = 1
 	url = https://github.com/bjesus/wttrbar
-	arch = any
+	arch = x86_64
 	license = MIT
-	makedepends = rust
+	makedepends = cargo
+	makedepends = git
 	provides = wttrbar
 	conflicts = wttrbar
-	source = git+https://github.com/bjesus/wttrbar
-	sha512sums = SKIP
+	source = wttrbar-git::git+https://github.com/bjesus/wttrbar.git
+	sha256sums = SKIP
 
 pkgname = wttrbar-git
diff --git a/PKGBUILD b/PKGBUILD
index 6dba4bb36071..1ffd9106050d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,35 @@
-# Maintainer: Daniel Menelkir <dmenelkir@gmail.com>
+# Maintainer: willemw <willemw12@gmail.com>
+# Conributor: Daniel Menelkir <dmenelkir@gmail.com>
 
-_pkgname="wttrbar"
-pkgname="wttrbar-git"
-pkgver=0.093c253
-pkgrel=0
-pkgdesc="Weather indicator for Waybar"
-url="https://github.com/bjesus/wttrbar"
-arch=("any")
-license=("MIT")
-makedepends=('rust')
-provides=('wttrbar')
-conflicts=('wttrbar')
-source=("git+$url")
-sha512sums=("SKIP")
+pkgname=wttrbar-git
+pkgver=0.4.0.r0.gdfa1473
+pkgrel=1
+pkgdesc='Show the weather in Waybar, using the great wttr.io'
+arch=(x86_64)
+url=https://github.com/bjesus/wttrbar
+license=(MIT)
+makedepends=(cargo git)
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("$pkgname::git+$url.git")
+sha256sums=('SKIP')
+
+pkgver() {
+  git -C $pkgname describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 prepare() {
-    mv $_pkgname/* .
-    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  cargo fetch --locked --manifest-path=$pkgname/Cargo.toml --target="$CARCH-unknown-linux-gnu"
 }
 
 build() {
-    export RUSTUP_TOOLCHAIN=stable
-    export CARGO_TARGET_DIR=target
-    cargo build --frozen --release --all-features
+  RUSTUP_TOOLCHAIN=stable cargo build --release --manifest-path=$pkgname/Cargo.toml --target-dir=target --all-features
 }
 
-package() {
-    install -Dm755 "target/release/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+check() {
+  RUSTUP_TOOLCHAIN=stable cargo test --release --manifest-path=$pkgname/Cargo.toml --target-dir=target
 }
 
+package() {
+  install -Dm0755 "target/release/${pkgname%-git}" -t "$pkgdir/usr/bin"
+}