tidy up and change versioning

2 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73f1bd93766d..9f6364b9cb98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yay-git
 	pkgdesc = Yet another yogurt. Pacman wrapper and AUR helper written in go. (development version)
-	pkgver = 100
-	pkgrel = 2
+	pkgver = 2.219.r73.gb69bab8
+	pkgrel = 1
 	url = https://github.com/Jguer/yay
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index be0806000999..8b03355c3e99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,24 @@
 # MAintainer: Tucker Boniface <tucker@boniface.tech>
 # Maintainer: Jguer <joaogg3@gmail.com>
-VCS="git"
 pkgname="yay-git"
-pkgver=100
-pkgrel=2
+_pkgname="yay"
+pkgver=2.219.r73.gb69bab8
+pkgrel=1
 pkgdesc="Yet another yogurt. Pacman wrapper and AUR helper written in go. (development version)"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url="https://github.com/Jguer/yay"
 license=('GPL')
 options=('!strip' '!emptydirs')
 depends=('sudo')
-makedepends=("${VCS}" 'go')
+makedepends=('git' 'go')
 conflicts=('yay-bin' 'yay')
 provides=('yay')
 source=("git+https://github.com/Jguer/yay/")
 md5sums=("SKIP")
 
 pkgver() {
-  cd "$srcdir/${pkgname%-${VCS}}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir/$_pkgname"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -26,19 +26,19 @@ prepare() {
   export GOBIN="$GOPATH/bin"
   mkdir -p "$GOPATH"
   rm -rf "$GOPATH/src"
-  ln -sf "$srcdir/${pkgname%-${VCS}}/vendor" "$GOPATH/src"
+  ln -sf "$srcdir/$_pkgname/vendor" "$GOPATH/src"
 }
 
 build() {
   export GOPATH="${srcdir}/.go"
   export GOBIN="$GOPATH/bin"
-  cd "$srcdir/${pkgname%-${VCS}}"
-  go build -v -o ${pkgname%-${VCS}} -ldflags "-s -w -X main.version=${pkgver}"
+  cd "$srcdir/$_pkgname"
+  go build -v -o $_pkgname -ldflags "-s -w -X main.version=${pkgver}"
 }
 
 package() {
-  _output="${srcdir}/${pkgname%-${VCS}}"
-  install -Dm755 "${_output}/${pkgname%-${VCS}}" "${pkgdir}/usr/bin/${pkgname%-${VCS}}"
+  _output="${srcdir}/$_pkgname"
+  install -Dm755 "${_output}/$_pkgname" "${pkgdir}/usr/bin/$_pkgname"
 
   # Install manpage
   install -Dm644 "${_output}/yay.8" "${pkgdir}/usr/share/man/man8/yay.8"