Update build options

- fixed `pkgver()` (upstream guys added tags)
- removing Cargo.lock
- Move init file to /etc/way-cooler

2 files changed, 14 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9723ea211ec1..d9081c372034 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
 # Generated by mksrcinfo v8
-# Sun Aug 14 00:35:41 UTC 2016
+# Sun Aug 14 18:38:38 UTC 2016
 pkgbase = way-cooler-git
 	pkgdesc = Customizeable Wayland compositor written in Rust
-	pkgver = r842.24c3c08
+	pkgver = 0.3.r3.gc5fb6f0
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/Immington-Industries/way-cooler
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 254c25b3f63c..a7fa09e1c411 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
 pkgname=way-cooler-git
-pkgver=r842.24c3c08
+pkgver=0.3.r3.gc5fb6f0
 pkgrel=1
+epoch=1
 pkgdesc="Customizeable Wayland compositor written in Rust"
 arch=('i686' 'x86_64')
 url="https://github.com/Immington-Industries/way-cooler"
@@ -12,8 +13,13 @@ source=("${pkgname}::git+https://github.com/Immington-Industries/way-cooler.git"
 md5sums=('SKIP')
 
 pkgver() {
+  cd "$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
   cd "$srcdir/$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  rm Cargo.lock
 }
 
 package() {
@@ -21,6 +27,9 @@ package() {
   cargo install way-cooler --root "$pkgdir"
   mkdir "$pkgdir/usr"
   mv "$pkgdir/bin" "$pkgdir/usr"
+
+  mkdir -p "$pkgdir/etc/way-cooler"
+  cp "$srcdir/$pkgname/config/init.lua" "$pkgdir/etc/way-cooler"
 }
 
 # vim:set ts=2 sw=2 et: