X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fbuildinfo.sh;h=1b446b42f31910f35b35e6e121a165a9149ef2a0;hp=e1b650f8f2e04afc2c294075473f0704b4ead9d4;hb=HEAD;hpb=282f0451dd141db3304ab73e4020a849e59721eb

diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh
index e1b650f8..1b446b42 100755
--- a/altosdroid/buildinfo.sh
+++ b/altosdroid/buildinfo.sh
@@ -7,10 +7,11 @@
 # version and build information, primarily).
 #
 
-infile=src/org/altusmetrum/AltosDroid/BuildInfo.java.in
-outfile=src/org/altusmetrum/AltosDroid/BuildInfo.java
+srcdir=app/src/main/java/org/altusmetrum/AltosDroid
+infile=${srcdir}/BuildInfo.java.in
+outfile=${srcdir}/BuildInfo.java
 
-. ../src/Version
+. ../src/Makedefs
 version=$VERSION
 branch=''
 commitnum=''
@@ -22,9 +23,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