diff options
Diffstat (limited to 'version.sh')
| -rwxr-xr-x | version.sh | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -7,18 +7,22 @@ datefmt='%Y%m%d' if head=$(git rev-parse --short=8 --verify HEAD 2>/dev/null); then - # If available, use the git commit revision for the package version, - # and add a date prefix for easy comparisons. - - date=$(git log --pretty=format:"%ct" -1 HEAD) - suffix='' - # Add a '-dirty' postfix for uncommitted changes. + # Add a '-dirty' suffix for uncommitted changes. if git diff-index HEAD | read dummy; then suffix=-dirty fi - version=$(printf "%($datefmt)T-g%s%s" ${date} ${head} ${suffix}) + if tag=$(git describe --tags --exact-match 2>/dev/null); then + # use a tag; remove any 'v' prefix from v<VERSION> tags + tag=${tag#v} + version=$(printf "%s%s" ${tag} ${suffix}) + else + # Use the git commit revision for the package version, and add + # a date prefix for easy comparisons. + date=$(git log --pretty=format:"%ct" -1 HEAD) + version=$(printf "%($datefmt)T-g%s%s" ${date} ${head} ${suffix}) + fi else # Default to current date and time. version="$(date +dev-$datefmt)" |
