Function order revised to reflect changes to their order of execution by makepkg. Include a remote sync in prepare to update assets during dirty builds.

2 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d500415dde4..5488933c18d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Aug 29 21:00:24 UTC 2016
+# Fri Sep 16 17:00:49 UTC 2016
 pkgbase = vsxu-git
 	pkgdesc = A free to use program that lets you create and perform real-time audio visual presets.
 	pkgver = 0.5.1.r50.g4a34b08
diff --git a/PKGBUILD b/PKGBUILD
index 43706a5d151d..ca8913809e43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,19 +23,11 @@ sha512sums=('SKIP'
             'SKIP')
 _branch=glfw3
 
-pkgver() {
-  cd "${srcdir}/${pkgname}"
-  git checkout ${_branch} --quiet
-  ( set -o pipefail
-    git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
-
 prepare() {
   cd "${pkgname}"
   [[ -d build ]] || mkdir build
   git checkout ${_branch}
+  git pull
   git submodule init
   git config submodule.plugins/src/mesh.importers/cal3d.url "${srcdir}/cal3d"
   git submodule update plugins/src/mesh.importers/cal3d
@@ -44,6 +36,14 @@ prepare() {
   sed -i -e "s/return false/return 0/" "${srcdir}/vsxu-git/plugins/src/mesh.importers/cal3d/cal3d/src/cal3d/xmlformat.cpp"
 }
 
+pkgver() {
+  cd "${srcdir}/${pkgname}"
+  ( set -o pipefail
+    git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
+}
+
 build() {
   cd "${pkgname}/build"
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr