better versioning

1 files changed, 16 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index acd464b27d85..3991de567969 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=wmrc
 pkgver=1.1
-pkgrel=3
+pkgrel=4
 pkgdesc='WMRC is a shell utility for extending window manager capabilities using modules with dependency and error checking.'
 arch=('any')
 url='https://github.com/filiparag/wmrc'
@@ -12,12 +12,22 @@ makedepends=('git')
 source=('git+https://github.com/filiparag/wmrc.git')
 sha1sums=('SKIP')
 
+prepare() {
+  cd "${pkgname}"
+  git checkout "tags/${pkgver}"
+}
+
+pkgver() {
+  cd "${pkgname}"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 package() {
   cd "${pkgname}"
-  install -Dm 775 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-  install -d -m 775 "${pkgdir}/usr/share/${pkgname}"
-  install -Dm 664 "rc.conf" "${pkgdir}/usr/share/${pkgname}/"
-  install -Dm 664 "usage.txt" "${pkgdir}/usr/share/${pkgname}/"
-  install -Dm 664 "wmrc.man" "${pkgdir}/usr/share/man/man1/${pkgname}.${pkgver}"
+  install -Dm 755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  install -d -m 755 "${pkgdir}/usr/share/${pkgname}"
+  install -Dm 644 "rc.conf" "${pkgdir}/usr/share/${pkgname}/"
+  install -Dm 644 "usage.txt" "${pkgdir}/usr/share/${pkgname}/"
+  install -Dm 644 "wmrc.man" "${pkgdir}/usr/share/man/man1/${pkgname}.${pkgver}"
   cp -r --preserve=mode "modules" "${pkgdir}/usr/share/${pkgname}/"
 }
\ No newline at end of file