now build in build(), and cleaned up version

2 files changed, 12 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc3c4d271492..f69c1f927d57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = i3blocks-contrib-git
 	pkgdesc = Official repository of community contributed blocklets
-	pkgver = 1.4.0.r246.154001e
-	pkgrel = 3.1
+	pkgver = 2.0.0.r5.g7f601f8
+	pkgrel = 1
 	url = https://github.com/vivien/i3blocks-contrib
 	arch = armv7h
 	arch = i686
@@ -58,7 +58,7 @@ pkgbase = i3blocks-contrib-git
 	optdepends = mpv: For ytdl-mpv script
 	optdepends = xclip: For ytdl-mpv script
 	optdepends = youtube-dl: For ytdl-mpv script
-	provides = i3blocks-contrib=1.4.0
+	provides = i3blocks-contrib=2.0.0
 	conflicts = i3blocks-contrib
 	source = i3blocks-contrib-git::git+https://github.com/vivien/i3blocks-contrib
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ca9cfd5c987d..527d46adc837 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 pkgname=i3blocks-contrib-git
 _pkgname=i3blocks-contrib
-pkgver=1.4.0.r246.154001e
-pkgrel=3.1
+pkgver=2.0.0.r5.g7f601f8
+pkgrel=1
 pkgdesc='Official repository of community contributed blocklets'
 arch=('armv7h' 'i686' 'x86_64')
 groups=('i3')
@@ -73,21 +73,22 @@ sha512sums=('SKIP')
 
 pkgver() {
     cd "${pkgname}"
-    VAR=$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')
-    VAR=${VAR#?}
-    printf "%s" "$VAR"
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-package () {
+build() {
   cd "${pkgname}"
-  install -d "${pkgdir}"/usr/lib/i3blocks
-
   for tobuild in $(find . -mindepth 2 -type f -name 'Makefile');
   do
     pushd $(dirname $tobuild)
     make
     popd
   done
+}
+
+package () {
+  cd "${pkgname}"
+  install -d "${pkgdir}"/usr/lib/i3blocks
 
   find . -type f -executable -not -path './.git/*' -exec install {} "${pkgdir}"/usr/lib/i3blocks/ \;
 }