Add `contrib/get_version.sh` script and run `autoreconf -i`

3 files changed, 26 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddee244641b2..bf2cb4fd59a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -53,6 +53,7 @@ pkgbase = gnunet
 	backup = etc/gnunet.conf
 	source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.16.0.tar.gz
 	source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.16.0.tar.gz.sig
+	source = get_version.sh
 	source = gnunet-system.service
 	source = gnunet.sysusers
 	source = gnunet.tmpfiles
@@ -62,6 +63,7 @@ pkgbase = gnunet
 	validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A
 	sha256sums = d32da6f13ff1cd8670525719ea0f79e9f76d2de7f6069860e0a77fc69a360068
 	sha256sums = SKIP
+	sha256sums = 8e8ee2d80c42aeabbd515e5b7bc9f0d199a7e6f46ef8a97e1e23313b44f74e4c
 	sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262
 	sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755
 	sha256sums = 5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0
diff --git a/PKGBUILD b/PKGBUILD
index 6f86a14c7be5..e4d275a31f77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: madmurphy <madmurphy333 AT gmail DOT com>
+# Maintainer: grufo <madmurphy333 AT gmail DOT com>
 # Contributor: redfish <redfish AT galactica DOT pw>
 # Contributor: kertase <kertase AT gmail DOT com>
 # Contributor: Sergej Pupykin <pupykin DOT s+arch AT gmail.com>
@@ -35,6 +35,7 @@ optdepends=('bluez: for bluetooth transport'
             'zbar: for reading/writing QR codes using gnunet-qr')
 backup=("etc/${pkgname}.conf")
 source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        "get_version.sh"
         "${pkgname}-system.service"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
@@ -45,6 +46,7 @@ install="${pkgname}.install"
 validpgpkeys=('3D11063C10F98D14BD24D1470B0998EF86F59B6A')
 sha256sums=('d32da6f13ff1cd8670525719ea0f79e9f76d2de7f6069860e0a77fc69a360068'
             'SKIP'
+            '8e8ee2d80c42aeabbd515e5b7bc9f0d199a7e6f46ef8a97e1e23313b44f74e4c'
             '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262'
             '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755'
             '5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0'
@@ -58,6 +60,9 @@ prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	export GNUNET_PREFIX='/usr/lib'
+	cp "${srcdir}/get_version.sh" "${srcdir}/${pkgname}-${pkgver}/contrib/get_version.sh"
+	chmod +x "${srcdir}/${pkgname}-${pkgver}/contrib/get_version.sh"
+	autoreconf -i
 
 }
 
diff --git a/get_version.sh b/get_version.sh
new file mode 100644
index 000000000000..35eed9f948fa
--- /dev/null
+++ b/get_version.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Gets the version number from git, or from the contents of .version
+VERSION=
+if test -f ".version"
+then
+  VERSION=$(cat .version)
+fi
+if test "x$VERSION" = "x" -a -d "./.git"
+then
+  VERSION=$(git describe --tags)
+  VERSION=${VERSION:1:${#VERSION}}
+  echo $VERSION > .version
+fi
+if test "x$VERSION" = "x"
+then
+  VERSION="unknown"
+fi
+echo -n "$VERSION"