From b87c3ef405599fd7954abc8fea87656a1b899c32 Mon Sep 17 00:00:00 2001
From: justbispo <justbispo@noreply.codeberg.org>
Date: Tue, 4 Jun 2024 13:20:20 +0100
Subject: [PATCH] Fix build and update to 0.4.0

---
 .SRCINFO | 12 +++++-------
 PKGBUILD | 59 +++++++++++++++++++++++++++-----------------------------
 2 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a13cd26b68c0..ae7b46dfe73b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = codeberg-cli
-	pkgdesc = CLI tool for Codeberg
-	pkgver = 0.1.0
+	pkgdesc = CLI Tool for Codeberg similar to gh and glab
+	pkgver = 0.4.0
 	pkgrel = 1
 	url = https://codeberg.org/RobWalt/codeberg-cli
 	arch = x86_64
 	license = AGPL3
 	makedepends = git
-	makedepends = rust
+	makedepends = cargo
 	depends = gcc-libs
 	depends = openssl
-	source = codeberg-cli::git+https://codeberg.org/RobWalt/codeberg-cli#commit=da32e4d4a3e9510c6b1ad609ece522f71691b201
-	source = Cargo.lock
-	b2sums = SKIP
-	b2sums = 038bad4d6ca321d712c0c259babf46cbd2d58c9cd71e694b6fe332a065f7bddada876fcf780f03f7988584ddd1b346126f6f8639984050d535a65d59f1387f62
+	source = codeberg-cli-0.4.0.tar.gz::https://codeberg.org/RobWalt/codeberg-cli/archive/v0.4.0.tar.gz
+	sha512sums = 8913d407ec8618984f8373553ab917fd78c73d1a202fc10eda14ba5cb13153f7a4bd1f615074fa52b229af71fcf6a3c12af8ec8d4de58fda5d50a9082c4e3580
 
 pkgname = codeberg-cli
diff --git a/PKGBUILD b/PKGBUILD
index ab3741895418..81b26b59f120 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,50 @@
 # Maintainer: George Rawlinson <grawlinson@archlinux.org>
 
 pkgname=codeberg-cli
-pkgver=0.1.0
+pkgver=0.4.0
 pkgrel=1
-pkgdesc='CLI tool for Codeberg'
+pkgdesc='CLI Tool for Codeberg similar to gh and glab'
 arch=('x86_64')
 url='https://codeberg.org/RobWalt/codeberg-cli'
 license=('AGPL3')
 depends=('gcc-libs' 'openssl')
-makedepends=('git' 'rust')
-_commit='da32e4d4a3e9510c6b1ad609ece522f71691b201'
-source=(
-  "$pkgname::git+$url#commit=$_commit"
-  'Cargo.lock'
-)
-b2sums=('SKIP'
-        '038bad4d6ca321d712c0c259babf46cbd2d58c9cd71e694b6fe332a065f7bddada876fcf780f03f7988584ddd1b346126f6f8639984050d535a65d59f1387f62')
-
-pkgver() {
-  cd "$pkgname"
-
-  git describe --tags | sed 's/^v//'
-}
+makedepends=('git' 'cargo')
+source=("$pkgname-$pkgver.tar.gz::https://codeberg.org/RobWalt/$pkgname/archive/v$pkgver.tar.gz")
+sha512sums=('8913d407ec8618984f8373553ab917fd78c73d1a202fc10eda14ba5cb13153f7a4bd1f615074fa52b229af71fcf6a3c12af8ec8d4de58fda5d50a9082c4e3580')
 
 prepare() {
   cd "$pkgname"
-
-  # use updated lockfile
-  cp -vf "$srcdir/Cargo.lock" .
-
-  # download dependencies
-  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  export RUSTUP_TOOLCHAIN=stable
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 
 build() {
   cd "$pkgname"
-
+  export RUSTUP_TOOLCHAIN=stable
+  export CARGO_TARGET_DIR=target
   cargo build --frozen --release --all-features
+
+  for shell in bash fish zsh; do
+      ./target/release/berg completion "$shell" > "$shell-completion"
+  done
 }
 
-#check() {
-#  cd "$pkgname"
-#
-#  cargo test --frozen --all-features
-#}
+check() {
+  cd "$pkgname"
+  export RUSTUP_TOOLCHAIN=stable
+  cargo test --frozen --all-features
+}
 
 package() {
   cd "$pkgname"
-
-  # binary
-  install -vDm755 -t "$pkgdir/usr/bin" target/release/cod
+  install -Dm755 -t "$pkgdir/usr/bin/" "target/release/berg"
+  install -Dm644 -t "$pkgdir/usr/share/doc/${pkgname}/README.md" "README.md"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" "LICENSE"
+  mkdir -p "${pkgdir}/usr/share/bash-completion/completions/"
+  mkdir -p "${pkgdir}/usr/share/zsh/site-functions/"
+  mkdir -p "${pkgdir}/usr/share/fish/vendor_completions.d/"
+  install -vDm644 bash-completion "$pkgdir/usr/share/bash-completion/completions/berg"
+  install -vDm644 fish-completion "$pkgdir/usr/share/fish/vendor_completions.d/berg.fish"
+  install -vDm644 zsh-completion "$pkgdir/usr/share/zsh/site-functions/_berg"
+  
 }