From: Keith Packard <keithp@keithp.com>
Date: Fri, 26 Oct 2012 21:08:32 +0000 (-0700)
Subject: Merge remote-tracking branch 'mjb/altosdroid'
X-Git-Tag: 1.1.9.2~14
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=a46c9398a5f02ff4b52b7a4309a51498560cadb5;hp=e57ab2a7bfb69c0ef9b5b7fa8e53e20a500e7c6c

Merge remote-tracking branch 'mjb/altosdroid'
---

diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh
index e1b650f8..ac97b7bd 100755
--- a/altosdroid/buildinfo.sh
+++ b/altosdroid/buildinfo.sh
@@ -22,9 +22,9 @@ 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')
+   branch=$(git branch | sed -ne 's/^\* //p')
    commitdetails=$(echo $describe | sed -e "s/^$version-//")
-   commitnum=$(echo $commitdetails | cut -d- -f1)
+   commitnum=$(echo $commitdetails | cut -s -d- -f1)
    commithash=$(echo $commitdetails | cut -d- -f2)
 fi