summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Fiore <mfiore@multitech.com>2016-10-18 10:06:20 -0500
committerMike Fiore <mfiore@multitech.com>2016-10-18 10:06:20 -0500
commit8c9b22c1fc1ef50705bb053cc9cc68ed0ec1dc75 (patch)
tree1e60a74dfcd4df8b3af38e6ca87c6df5d00770d4
parent81cf0b046933e26fb53784e080cd0b913d83590e (diff)
downloadmtdot-box-evb-factory-firmware-8c9b22c1fc1ef50705bb053cc9cc68ed0ec1dc75.tar.gz
mtdot-box-evb-factory-firmware-8c9b22c1fc1ef50705bb053cc9cc68ed0ec1dc75.tar.bz2
mtdot-box-evb-factory-firmware-8c9b22c1fc1ef50705bb053cc9cc68ed0ec1dc75.zip
remove branch stuff from version.sh
-rwxr-xr-xversion.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/version.sh b/version.sh
index 9b53415..3975304 100755
--- a/version.sh
+++ b/version.sh
@@ -1,10 +1,5 @@
#!/bin/bash
-VERSION=`git describe --tags`
-BRANCH=$(git branch | grep '^*' | sed 's/^\* //')
-
-if [[ $BRANCH != "master" ]] && [[ $BRANCH != "(no branch)" ]]; then
- VERSION="$VERSION-$BRANCH"
-fi
+VERSION=`git describe`
echo -e "#ifndef __VERSION_H__\r\n#define __VERSION_H__\r\n\r\n#define MTDOT_BOX_VERSION \"$VERSION\"\r\n\r\n#endif" > dotbox_version.h