diff options
| author | Keith Packard <keithp@keithp.com> | 2012-10-26 14:08:32 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-10-26 14:08:32 -0700 |
| commit | a46c9398a5f02ff4b52b7a4309a51498560cadb5 (patch) | |
| tree | a0e33041c9ce82d641fb0403990740083ce46d55 | |
| parent | e57ab2a7bfb69c0ef9b5b7fa8e53e20a500e7c6c (diff) | |
| parent | 56023cf5da9deede9fe627fe327783eceecf08f7 (diff) | |
Merge remote-tracking branch 'mjb/altosdroid'
| -rwxr-xr-x | altosdroid/buildinfo.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |