X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fbuildinfo.sh;h=ac97b7bd83b804fe18cfed7eecb8d106afb2307f;hp=f620c4a0f0819b1787f2f122d519840b69999f58;hb=a533ea525620f194fd89fedad043659bb433d71b;hpb=055f3232decc07e064d596469b81cf9869411c2d

diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh
index f620c4a0..ac97b7bd 100755
--- a/altosdroid/buildinfo.sh
+++ b/altosdroid/buildinfo.sh
@@ -1,31 +1,42 @@
 #!/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
+branch=''
+commitnum=''
+commithash=''
 builddate=$(date "+%Y-%m-%d")
 buildtime=$(date "+%H:%M")
+buildtz=$(date "+%z")
 
 
-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
+   branch=$(git branch | sed -ne 's/^\* //p')
+   commitdetails=$(echo $describe | sed -e "s/^$version-//")
+   commitnum=$(echo $commitdetails | cut -s -d- -f1)
+   commithash=$(echo $commitdetails | cut -d- -f2)
+fi
+
 
-echo "Version $describe, built on $builddate, $buildtime"
+echo "Version $describe, built on $builddate $buildtime $buildtz"
 
-sed -e "s/@DESCRIBE@/$describe/" \
-    -e "s/@VERSION@/$version/" \
+sed -e "s/@VERSION@/$version/" \
+    -e "s/@DESCRIBE@/$describe/" \
+    -e "s/@BRANCH@/$branch/" \
     -e "s/@COMMITNUM@/$commitnum/" \
     -e "s/@COMMITHASH@/$commithash/" \
     -e "s/@BUILDDATE@/$builddate/" \
     -e "s/@BUILDTIME@/$buildtime/" \
+    -e "s/@BUILDTZ@/$buildtz/" \
  $infile > $outfile