Improvements suggested by guys1-7

1 files changed, 17 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 775684a115c8..2936917ffa28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,39 @@
 # Contributor: Julius Gonsior <aur@gaenseri.ch>
 
 pkgname=buchhaltung-git
-pkgver=20180121
+pkgver=0.0.5.r34.g4c5832f
 pkgrel=1
-pkgdesc="The ledger helper buchhaltung tool"
+pkgdesc="Automatic import, bayesian account matching, and efficient manual entry of ledger transactions."
 arch=('i686' 'x86_64')
 makedepends=('git' 'stack')
 url="https://johannesgerer.com/software/#buchhaltung"
 license=('MIT')
-options=('strip')
 source=(git+https://github.com/johannesgerer/buchhaltung)
 sha256sums=('SKIP')
 provides=('buchhaltung')
-optdepends=('aqbanking: Required for direct retrieval of bank transcations via FinTS/HBCI/EBICS (Germany) or OFXDirectConnect (USA, Canada, UK)'
-'dbacl: Bayesian classifier used to match transaction to accounts. '
-'hledger:  for quering the ledger, create balance and report statements, web interface, etc.')
+conflicts=('buchhaltung')
+
+optdepends=(
+    'aqbanking: Required for direct retrieval of bank transcations'
+    'dbacl: Bayesian classifier used to match transaction to accounts. '
+    'hledger:  for quering the ledger, create balance and report statements, web interface, etc.')
 
 pkgver() {
   cd ${pkgname%-git}
-  git log -1 --format="%cd" --date=short | sed "s|-||g"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+  cd ${pkgname%-git}
+  
+  stack --local-bin-path "$pkgdir/usr/bin" build
 }
 
 package() {
   cd ${pkgname%-git}
+  stack --local-bin-path "$pkgdir/usr/bin" install
 
-  msg2 'Installing license...'
   install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/buchhaltung"
 
-  msg2 'Installing...'
-  mkdir -p "$pkgdir/usr/bin"
-  stack --local-bin-path "$pkgdir/usr/bin" install
-
-  msg2 'Cleaning up pkgdir...'
-  find "$pkgdir" -type f -name .gitignore -exec rm -r '{}' +
+  find "$pkgdir" -type f -name .gitignore -delete
 }