Rewrite based on non-git version in community

2 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e824de40b96b..848fe99c57a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = i3status-rust-git
 	pkgdesc = Very resourcefriendly and feature-rich replacement for i3status to use with bar programs (like i3bar and swaybar), written in pure Rust
-	pkgver = 0.30.5.r3204.gffc645a1
+	pkgver = 0.32.3.r3432.g4a048bb1
 	pkgrel = 1
 	url = https://github.com/greshake/i3status-rust
 	install = i3status-rust.install
diff --git a/PKGBUILD b/PKGBUILD
index fa40b04ee032..a7f561d397fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Bryan Malyn <bim9262@gmail.com>
 
 pkgname=i3status-rust-git
-pkgver=0.30.5.r3204.gffc645a1
+pkgver=0.32.3.r3432.g4a048bb1
 pkgrel=1
 pkgdesc='Very resourcefriendly and feature-rich replacement for i3status to use with bar programs (like i3bar and swaybar), written in pure Rust'
 arch=('x86_64')
@@ -30,26 +30,33 @@ pkgver() {
   echo $(grep '^version =' Cargo.toml|head -n1|cut -d\" -f2).r$(git rev-list --count HEAD).g$(git describe --always)
 }
 
+prepare() {
+  cd "${pkgname%-*}"
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
 build() {
   cd "${pkgname%-*}"
+  export RUSTUP_TOOLCHAIN=stable
+  export CARGO_TARGET_DIR=target
   cargo build --release --features 'pulseaudio maildir'
   cargo xtask generate-manpage
 }
 
 package() {
   cd "${pkgname%-*}"
-  install -Dm755 target/release/i3status-rs "$pkgdir/usr/bin/i3status-rs"
-  install -Dm644 man/i3status-rs.1 -t "$pkgdir/usr/share/man/man1"
+  install -Dm755 -t "${pkgdir}"/usr/bin target/release/i3status-rs
+  install -Dm644 -t "${pkgdir}"/usr/share/man/man1 man/i3status-rs.1
 
   for icon_set in files/icons/*.toml; do
-    install -Dm644 "$icon_set" -t "$pkgdir/usr/share/${pkgname%-*}/icons"
+    install -Dm644 -t "${pkgdir}"/usr/share/${pkgname}/icons "${icon}"
   done
 
   for theme in files/themes/*.toml; do
-    install -Dm644 "$theme" -t "$pkgdir/usr/share/${pkgname%-*}/themes"
+    install -Dm644 -t "${pkgdir}"/usr/share/${pkgname}/themes "${theme}"
   done
 
   for example_config in examples/*.toml; do
-    install -Dm644 "$example_config" -t "$pkgdir/usr/share/doc/${pkgname%-*}/examples"
+    install -Dm644 -t "${pkgdir}"/usr/share/doc/${pkgname}/examples/ ${example}
   done
 }