Refactor PKGBUILD

1 files changed, 41 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index eb3747767648..23a81afde69e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,54 @@
 # Maintainer: Daniel Souza <aur at posix dot dev dot br>
 
-_gitbranch=main
-_gitauthor=danisztls
-pkgname=fzfx-git
-pkgver=v1.1.2.r0.ged3d2f1
-pkgrel=3
-pkgdesc="A wrapper to fzf that does specialized fuzzy searches"
+_pkgname="fzfx"
+_gitauthor="danisztls"
+_gitbranch="main"
+
+pkgname="${_pkgname}-git"
+pkgver=v1.3.r3.g66b87aa
+pkgrel=1
+pkgdesc="Opinionated wrapper that extends FZF."
 arch=('any')
+url="https://github.com/${_gitauthor}/${_pkgname}"
 license=('MIT')
-url="https://github.com/${_gitauthor}/${pkgname%-git}"
-source=("git+https://github.com/${_gitauthor}/${pkgname%-git}.git#branch=${_gitbranch}")
+groups=()
+depends=('bash' 'fzf' 'fd' 'ripgrep' 'bat')
+makedepends=('git')
+optdepends=('bat: improved text preview'
+            'evince: preview pdfs'
+            'mpv: preview videos'
+            'feh: preview pictures'
+            'grc: colorize ps'
+            'tree: improved dir preview'
+            'ripgrep-all: fulltext search blobs')
+provides=("${_pkgname}")
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("git+https://github.com/${_gitauthor}/${_pkgname}.git#branch=${_gitbranch}")
+noextract=()
 sha512sums=('SKIP')
-depends=('fzf' 'fd' 'ripgrep' 'bat')
-optdepends=('bat: improved text preview' 'evince: preview pdfs' 'mpv: preview videos' 'feh: preview pictures' 'grc: colorize ps' 'tree: improved dir preview' 'ripgrep-all: fulltext search blobs')
-makedepends=(git)
-conflicts=("${pkgname%-git}")
-provides=("${pkgname%-git}")
 
 pkgver() {
-  cd "$srcdir/${pkgname%-git}"
-  # Use last tag
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$srcdir/$_pkgname"
+  # Use tags but fallback to revision
+  ( set -o pipefail
+    git describe --tags --long --abbrev=7 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
+  )
 }
 
+# build() {
+# }
+
 package() {
-  cd "$srcdir/${pkgname%-git}"
+  cd "$srcdir/${_pkgname}"
   
   install -Dm755 fzfx "${pkgdir}/usr/bin/fzfx"
-  install -vDm 644 ignore "${pkgdir}/usr/share/${pkgname%-git}/ignore"
-  install -vDm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname%-git}/LICENSE"
-  install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname%-git}"
+  install -vDm 644 ignore "${pkgdir}/usr/share/${_pkgname}/ignore"
+  install -vDm 644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${_pkgname}"
 }