2 files changed, 23 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09bdbdcbe41c..0a86930ee1ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = krabby-git
-	pkgdesc = Print pokemon sprites in your terminal
-	pkgver = r18.824c45f
+	pkgdesc = Print pokemon sprites in your terminal (development version)
+	pkgver = 0.1.6.r0.g2669909
 	pkgrel = 1
 	url = https://github.com/yannjor/krabby
-	arch = any
+	arch = x86_64
 	license = GPL-3.0
 	makedepends = git
 	makedepends = rust
-	makedepends = cargo
-	provides = krabby
 	conflicts = krabby
-	source = git+https://github.com/yannjor/krabby.git
-	sha256sums = SKIP
+	source = krabby-git::git+https://github.com/yannjor/krabby#branch=main
+	md5sums = SKIP
 
 pkgname = krabby-git
diff --git a/PKGBUILD b/PKGBUILD
index 8b59c9356f56..90662644d3ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,28 @@
 # Maintainer: Yann Jorelle <yannjorelle@protonmail.com>
-pkgname=krabby-git
-_pkgname=krabby
-_binname=krabby
-pkgver=r18.824c45f
+# Credits: @ChewingBever https://github.com/ChewingBever for creating this script
+pkgbase='krabby-git'
+pkgname='krabby-git'
+pkgver=0.1.6.r0.g2669909
 pkgrel=1
-pkgdesc="Print pokemon sprites in your terminal"
-url="https://github.com/yannjor/krabby"
-license=("GPL-3.0")
-arch=("any")
-provides=("krabby")
-conflicts=("krabby")
-makedepends=("git" "rust" "cargo")
-source=("git+https://github.com/yannjor/krabby.git")
-sha256sums=("SKIP")
+pkgdesc='Print pokemon sprites in your terminal (development version)'
+arch=('x86_64')
+url='https://github.com/yannjor/krabby'
+license=('GPL-3.0')
+makedepends=('git' 'rust')
+conflicts=('krabby')
+source=("${pkgname}::git+https://github.com/yannjor/krabby#branch=main")
+md5sums=('SKIP')
 
-pkgver(){
-    cd "$_pkgname"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+pkgver() {
+    git -C "${pkgname}" describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "$srcdir/$_pkgname" || exit 1
-  # Build a release build
-  cargo build --release
+    cd "${pkgname}"
+    cargo build --release
 }
 
 package() {
-    cd "$_pkgname" || exit 1
-    rm -rf "$pkgdir/usr/local/opt/$_pkgname"
-    mkdir -p "$pkgdir/usr/local/opt/$_pkgname/colorscripts/regular"
-    mkdir -p "$pkgdir/usr/local/opt/$_pkgname/colorscripts/shiny"
-    mkdir -p "$pkgdir/usr/local/bin"
-    install -Dm644 colorscripts/regular/* -t "$pkgdir/usr/local/opt/$_pkgname/colorscripts/regular"
-    install -Dm644 colorscripts/shiny/* -t "$pkgdir/usr/local/opt/$_pkgname/colorscripts/shiny"
-    install -Dm644 pokemon.json "$pkgdir/usr/local/opt/$_pkgname/pokemon.json"
-    install -Dm755 target/release/krabby "$pkgdir/usr/local/opt/$_pkgname/$_binname"
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-    install -Dm644 README.md "$pkgdir/usr/share/doc/$_pkgname/README.md"
-    # creating symlink in usr/local/bin
-    ln -sf "/usr/local/opt/$_pkgname/krabby" "$pkgdir/usr/local/bin/$binname"
+    install -Dm755 "${pkgname}/target/release/krabby" -t "${pkgdir}/usr/bin"
+    install -Dm644 "${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }