first cut at turnon scripts for EasyTimer v2

[fw/altos] / altosdroid / buildinfo.sh

diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh
index afd649735d235a741f57d267864e6fe92077611d..1b446b42f31910f35b35e6e121a165a9149ef2a0 100755 (executable)
--- 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=''
@@ -24,7 +25,7 @@ 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 -d- -f1)
+   commitnum=$(echo $commitdetails | cut -s -d- -f1)
    commithash=$(echo $commitdetails | cut -d- -f2)
 fi