Fixing version number in arch package and go build.

1 files changed, 27 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ebf5226512fd..4f33036f220d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,56 @@
-# Maintainer : fuero <fuerob@gmail.com>
-# Maintainer : Fredy García <frealgagu at gmail dot com>
+# Maintainer: fuero <fuerob@gmail.com>
+# Maintainer: Fredy García <frealgagu at gmail dot com>
 
-pkgname='lazygit-git'
-pkgdesc='A simple terminal UI for git commands'
-pkgver=r953.b9ecb82
+pkgname=lazygit-git
+pkgver=0.5.r25.b9ecb82
 pkgrel=1
+pkgdesc='A simple terminal UI for git commands'
+arch=('x86_64')
 _repo_prefix='github.com/jesseduffield'
-_repo_name="${pkgname/-git}"
+_repo_name="${pkgname%-git}"
 url="https://${_repo_prefix}/${_repo_name}"
 license=('MIT')
-arch=('x86_64')
-makedepends=('go-pie' 'git')
 depends=('glibc')
+makedepends=('git' 'go-pie')
 conflicts=('lazygit')
 provides=('lazygit')
-_commit='master'
-source=("git+https://${_repo_prefix}/${_repo_name}#commit=${_commit}")
+source=("${_repo_name}::git+https://${_repo_prefix}/${_repo_name}")
 sha512sums=('SKIP')
 
 pkgver() {
-  cd "$_repo_name"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${_repo_name}"
+  (
+    set -o pipefail
+    git describe --long --tags 2> /dev/null | sed "s/^[A-Za-z\.\-]*//;s/\([^-]*-\)g/r\1/;s/-/./g" || 
+    printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" 
+  )
 }
 
 prepare () {
-  mkdir -p "src/${_repo_prefix}"
-  ln -snf "$(pwd)/${_repo_name}" "src/${_repo_prefix}/${_repo_name}"
+  mkdir -p "${srcdir}/src/${_repo_prefix}"
+  ln -snf "${srcdir}/${_repo_name}" "${srcdir}/src/${_repo_prefix}/${_repo_name}"
 }
 
 clean() {
   # Clean up symlink
-  rm -f "src/${_repo_prefix}/${_repo_name}"
-  rm -f ${_repo_name}.bin
+  rm -f "${srcdir}/src/${_repo_prefix}/${_repo_name}"
+  rm -f "${_repo_name}.bin"
 }
 
 build () {
-  cd "src/${_repo_prefix}/${_repo_name}"
+  cd "${srcdir}/src/${_repo_prefix}/${_repo_name}"
   export GOPATH="${srcdir}"
-  export PATH="$PATH:$GOPATH/bin"
-  go build -x -i -v -ldflags "-X main.commit=${pkgver##*.} -X main.date=$(date -u +%Y%m%d.%H%M%S) -X main.version=$(cat VERSION).${pkgver##*.}" -o ${_repo_name}.bin
+  export PATH="${PATH}:${GOPATH}/bin"
+  go build -x -i -v -ldflags "-X main.commit=$(git rev-parse --short HEAD) -X main.date=$(date -u +%Y%m%d.%H%M%S) -X main.version=$(git describe --always --tags --abbrev=0).$(git rev-parse --short HEAD)" -o "${_repo_name}.bin"
 }
 
 package () {
-  cd "src/${_repo_prefix}/${_repo_name}"
-  install -Dm755 ${_repo_name}.bin "${pkgdir}/usr/bin/${_repo_name}"
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "${srcdir}/src/${_repo_prefix}/${_repo_name}"
+  install -Dm755 "${srcdir}/src/${_repo_prefix}/${_repo_name}/${_repo_name}.bin" "${pkgdir}/usr/bin/${_repo_name}"
+  install -Dm644 "${srcdir}/src/${_repo_prefix}/${_repo_name}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  for file in *.md docs/*.md
+  for _file in *.md docs/*.md
   do
-    install -Dm644 "${file}" "${pkgdir}/usr/share/doc/${pkgname}/$(basename $file)"
+    install -Dm644 "${_file}" "${pkgdir}/usr/share/doc/${pkgname}/$(basename ${_file})"
   done
 }