zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Suppress error when on detached head

Browse source
This commit is contained in:
Richard Wackerbarth 2015-06-03 22:55:11 -05:00
parent 54375cc7a4
commit b3a3080b4b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
LinuxAddons/bin/generate_version_header_for_marlin
View file

@ -13,8 +13,8 @@ echo "#define BUILD_UNIX_DATETIME" `date +%s` >>"$OUTFILE"
echo "#define STRING_DISTRIBUTION_DATE" `date '+"%Y-%m-%d %H:%M"'` >>"$OUTFILE" echo "#define STRING_DISTRIBUTION_DATE" `date '+"%Y-%m-%d %H:%M"'` >>"$OUTFILE"
( set +e ( set +e
cd "$DIR" cd "$DIR"
BRANCH=`git symbolic-ref --short HEAD` BRANCH=`git symbolic-ref -q --short HEAD`
if [ "x$BRANCH" == "xHEAD" ] ; then if [ "x$BRANCH" == "x" ] ; then
BRANCH="" BRANCH=""
elif [ "x$BRANCH" == "xDevelopment" ] ; then elif [ "x$BRANCH" == "xDevelopment" ] ; then
BRANCH=" dev" BRANCH=" dev"
@ -31,5 +31,4 @@ echo "#define STRING_DISTRIBUTION_DATE" `date '+"%Y-%m-%d %H:%M"'` >>"$OUTFILE"
echo "// Deprecated URL definition" >>"$OUTFILE" echo "// Deprecated URL definition" >>"$OUTFILE"
echo "#define FIRMWARE_URL \""$URL"\"" >>"$OUTFILE" echo "#define FIRMWARE_URL \""$URL"\"" >>"$OUTFILE"
fi fi
) )