altosdroid: Add branch to BuildInfo

[fw/altos] / altosdroid / buildinfo.sh

diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh
index 781b251bc6ecb4489915f58a466e554a8d097831..e1b650f8f2e04afc2c294075473f0704b4ead9d4 100755 (executable)
--- a/altosdroid/buildinfo.sh
+++ b/altosdroid/buildinfo.sh
@@ -12,26 +12,31 @@ 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")
 
 
 describe=$(git describe --match "$version" --long --always 2>/dev/null || echo '')
 if [ -n "$describe" ]; then
+   branch=$(git status -s -b | sed -ne '1s/^## \(.*\)\.\.\..*$/\1/p')
    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"
+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