Add .gitignore and update PKGBUILD

2 files changed, 19 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e3c7d4703c9c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.pkg.tar.xz
+pkg
+src
+/lemonbar
diff --git a/PKGBUILD b/PKGBUILD
index 12c3a4ca08fe..47979fb9a2f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Axel Parra <axel.pc@openmailbox.org>
+# Maintainer: Axel Parra <apc@openmailbox.org>
 
 pkgname=lemonbar-git
-_pkgname=bar
-pkgver=170.25c3441
+_pkgname=lemonbar
+pkgver=172.a9f285f
 pkgrel=1
 pkgdesc="A featherweight, lemon-scented, bar based on xcb."
 arch=('i686' 'x86_64')
@@ -11,22 +11,28 @@ license=('MIT')
 depends=('libxcb')
 makedepends=('git')
 provides=('lemonbar')
-conflicts=('lemonbar-xft-git' 'bar-aint-recursive-git' 'bar-aint-recursive-xft-git')
-source=("$_pkgname::git+https://github.com/Lemonboy/bar.git#branch=master")
+conflicts=('lemonbar-xft-git')
+source=("$_pkgname::git+https://github.com/Lemonboy/bar.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+	cd "${pkgname}"
+
+	if git_version=$( git describe --long --tags 2>/dev/null ); then
+		IFS='-' read last_tag tag_rev commit <<< "$git_version"
+		printf '%s.r%s.%s' "$last_tag" "$tag_rev" "$commit"
+	else
+		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	fi
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
+  cd "$_pkgname"
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+  cd "$_pkgname"
   make PREFIX=/usr DESTDIR="$pkgdir" install
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }