Refactor PKGBUILD

2 files changed, 35 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 036fe2d4f3b4..8b5e2a5fca43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = arbie-git
-	pkgdesc = Automatic Robust Backup, an archiving and synchronization tool.
-	pkgver = v1.1.1.r0.g5a2d9d2
-	pkgrel = 3
+	pkgdesc = Encrypted backup and synchronization tool.
+	pkgver = v1.3.0.r3.g369fe50
+	pkgrel = 1
 	url = https://github.com/danisztls/arbie
 	install = arbie.install
 	arch = any
 	license = MIT
+	makedepends = git
 	depends = bash
 	depends = borg
 	depends = gocryptfs
 	depends = rclone
 	depends = rsync
 	depends = systemd
-	depends = git
 	optdepends = pass: standard password manager
 	optdepends = gopass: improved password manager
 	provides = arbie
-	conflicts = arbie
 	source = git+https://github.com/danisztls/arbie.git#branch=main
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 2fe1f74322ac..f8cffeacac7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,44 @@
 # Maintainer: Daniel Souza <aur at posix dot dev dot br>
 
-_gitbranch=main
-_gitauthor=danisztls
-pkgname=arbie-git
-pkgver=v1.1.1.r0.g5a2d9d2
-pkgrel=3
-pkgdesc="Automatic Robust Backup, an archiving and synchronization tool."
+_pkgname="arbie"
+_gitauthor="danisztls"
+_gitbranch="main"
+
+pkgname="${_pkgname}-git"
+pkgver=v1.3.0.r3.g369fe50
+pkgrel=1
+pkgdesc="Encrypted backup and synchronization tool."
 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' 'borg' 'gocryptfs' 'rclone' 'rsync' 'systemd')
+makedepends=('git')
+optdepends=('pass: standard password manager'
+            'gopass: improved password manager')
+provides=("${_pkgname%}")
+conflicts=()
+replaces=()
+backup=()
+options=()
 install=arbie.install
+changelog=
+source=("git+https://github.com/${_gitauthor}/${_pkgname}.git#branch=${_gitbranch}")
+noextract=()
 sha512sums=('SKIP')
-depends=('bash' 'borg' 'gocryptfs' 'rclone' 'rsync' 'systemd' 'git')
-optdepends=('pass: standard password manager' 'gopass: improved password manager')
-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 "${pkgname%-git}"
   make DESTDIR="${pkgdir}/" install