miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Add branch name in version"

Browse Source 
This reverts commit 03cd87df1c.
This commit is contained in:
angt
2016-03-09 11:42:51 +00:00
parent d04acc9c0f
commit d2046eb00b
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
version.sh
View File

@@ -5,14 +5,9 @@
[ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null` [ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null`
[ -z "${VERSION}" ] && VERSION="0.0.0" [ -z "${VERSION}" ] && VERSION=0.0.0
[ "$1" = "major" ] && printf ${VERSION%%.*} \ [ "$1" = "major" ] && printf ${VERSION%%.*} \
&& exit 0 && exit 0
BRANCH=`git rev-parse --abbrev-ref HEAD 2>/dev/null`
[ -n "${BRANCH}" ] && [ "${BRANCH}" != "master" ] \
&& VERSION=${VERSION}-${BRANCH}
printf ${VERSION} | tee VERSION printf ${VERSION} | tee VERSION