Fix branch name

build-aux/version.sh

@@ -8,7 +8,7 @@ PAT=`sed -En 's/#define REV_PATCH ([0-9]+).*/\1/p' $FIL | tr -d '\n'`
 PKG=`sed -En 's/#define PACKAGE "([a-z]+)".*/\1/p' $FIL | tr -d '\n'`
 NAM=`sed -En 's/#define PACKAGE_NAME "([-A-Za-z ]+)".*/\1/p' $FIL | tr -d '\n'`
 NUM=`git log --max-count=1 --pretty=format:"%ai" | cut -c 3,4,6,7,9,10`
-BRA=`git rev-parse --abbrev-ref HEAD`
+BRA=`git rev-parse --abbrev-ref HEAD | git rev-parse --abbrev-ref HEAD | tr -c A-Za-z0-9 _ | sed 's/_+/_/g;s/_$//;s/^_//'`
 GIT=`git --version | cut -f3 -d' '`
 SYS=`uname`
 HDW=`uname -m`

utilities/build_number

@@ -16,7 +16,7 @@ if [ -d .git ]; then
 		echo "#define REV_YEAR $(date '+%Y')" >> $2
 		echo "#define BUILD_NAME \"$(git remote | head -n 1)\"" >> $2
 		echo "#define BUILD_URL \"$(git remote -v | head -n 1 | cut -f1 -d' ' | cut -f2 | sed -e 's/\.git//')\"" >> $2
-		echo "#define BUILD_BRANCH \"$(git rev-parse --abbrev-ref HEAD)\"" >> $2
+		echo "#define BUILD_BRANCH \"$(build-aux/version.sh --branch)\"" >> $2
 		echo "#define BUILD_SYSTEM \"$(uname -s)\"" >> $2
 		echo "#define BUILD_RELEASE \"$(uname -sr)\"" >> $2
 		echo "#define BUILD_ID \"$(git log -n 1 | sed -n '1s/^commit //p')\"" >> $2