bugfixes + embraced some dirs with quotes + git version fix

1 files changed, 8 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ce8bc42622e1..59e5a3e01bfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christian Rebischke <echo Q2hyaXMuUmViaXNjaGtlQGdtYWlsLmNvbQo= | base64 -d>
 pkgname=binnavi-git
-pkgver=0.0.590.8512d7c
-pkgrel=2
+pkgver=v6.0.0.10.a2a3fa4
+pkgrel=1
 pkgdesc="BinNavi is a binary analysis IDE that allows to inspect, navigate, edit and annotate control flow graphs and call graphs of disassembled code"
 url="https://github.com/google/binnavi"
 arch=('any')
@@ -10,17 +10,17 @@ depends=('java-environment>=7' 'postgresql')
 makedepends=('git' 'maven' 'apache-ant')
 provides=('binnavi')
 conflicts=('binnavi')
-source=(git+https://github.com/google/binnavi.git 'binnavi')
+source=(git+https://github.com/google/binnavi.git 'binnavi.sh')
 sha512sums=('SKIP'
             'bb274ca29a994ef8b98aa77e0be745e297bd2f7e65dd394594169ffec3910b4dd4982e353202c6b201472632a3f7b16bd7d905b7006e21d76b7299b78fc7f390')
 
 pkgver() {
-  cd ${pkgname}
-  printf "%s.%s.%s" "0.0" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/binnavi"
+  printf "%s.%s.%s" "$(git describe --tags --abbrev=0)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "${srcdir}/$pkgname-$pkgver"
+  cd "${srcdir}/binnavi"
   mvn dependency:copy-dependencies
   ant -f src/main/java/com/google/security/zynamics/build.xml \
   build-binnavi-fat-jar
@@ -28,8 +28,8 @@ build() {
 
 package() {
   mkdir -p "${pkgdir}/usr/share/java/binnavi"
-  cd "${srcdir}/$pkgname-$pkgver/target/"
+  cd "${srcdir}/$pkgname/target/"
   mv * "${pkgdir}/usr/share/java/binnavi/"
-  install -D -m755 ${srcdir}/binnavi ${pkgdir}/usr/bin/binnavi
+  install -D -m755 "${srcdir}/binnavi.sh" "${pkgdir}/usr/bin/binnavi"
 }
 # vim:set et sw=2 ts=2 tw=80: