#!/bin/sh
#
+# Author: Mike Beattie <mike@ethernal.org>
+#
+# Script to parse result from git describe, and push values into
+# BuildInfo.java for use within altosdroid (to display the current
+# version and build information, primarily).
+#
-describe=$(git describe --always 2>/dev/null || echo '')
-if [ -n "$describe" ]; then
- version=$(echo $describe | cut -d- -f1)
- commitnum=$(echo $describe | cut -d- -f2)
- commithash=$(echo $describe | cut -d- -f3)
-else
- . ../src/Version
- version=$VERSION
- commitnum=''
- commithash=''
-fi
+infile=src/org/altusmetrum/AltosDroid/BuildInfo.java.in
+outfile=src/org/altusmetrum/AltosDroid/BuildInfo.java
+. ../src/Version
+version=$VERSION
+commitnum=''
+commithash=''
builddate=$(date "+%Y-%m-%d")
buildtime=$(date "+%H:%M")
-infile=src/org/altusmetrum/AltosDroid/BuildInfo.java.in
-outfile=src/org/altusmetrum/AltosDroid/BuildInfo.java
+describe=$(git describe --match "$version" --long --always 2>/dev/null || echo '')
+if [ -n "$describe" ]; then
+ commitdetails=$(echo $describe | sed -e "s/^$version-//")
+ commitnum=$(echo $commitdetails | cut -d- -f1)
+ commithash=$(echo $commitdetails | cut -d- -f2)
+fi
+
echo "Version $describe, built on $builddate, $buildtime"