Update versioning to v1.2.3 where derived from the tag and 3 is commits since last tag

This commit is contained in:
Neil Alexander 2018-03-05 22:14:36 +00:00
parent c57cf73219
commit b1380baa9f

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# Get the last tag # Get the last tag
TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" 2>/dev/null) TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*" 2>/dev/null)
# Get the number of commits from the last tag # Get the number of commits from the last tag
COUNT=$(git rev-list $TAG..HEAD --count 2>/dev/null) COUNT=$(git rev-list $TAG..HEAD --count 2>/dev/null)
@ -10,17 +10,17 @@ COUNT=$(git rev-list $TAG..HEAD --count 2>/dev/null)
if [ $? != 0 ]; then if [ $? != 0 ]; then
COUNT=$(git rev-list HEAD --count 2>/dev/null) COUNT=$(git rev-list HEAD --count 2>/dev/null)
printf 'v0.0.0-%d' "$COUNT" printf 'v0.0.%d' "$COUNT"
exit -1 exit -1
fi fi
# Trim the "v" off the front
TAG=$(echo $TAG | cut -c 2-)
# Split out into major, minor and patch numbers # Split out into major, minor and patch numbers
MAJOR=$(echo $TAG | cut -d "." -f 1) MAJOR=$(echo $TAG | cut -c 2- | cut -d "." -f 1)
MINOR=$(echo $TAG | cut -d "." -f 2) MINOR=$(echo $TAG | cut -c 2- | cut -d "." -f 2)
PATCH=$(echo $TAG | cut -d "." -f 3)
# Output in the desired format # Output in the desired format
printf 'v%d.%d.%d-%d' "$MAJOR" "$MINOR" "$PATCH" "$COUNT" if [ $COUNT = 0 ]; then
printf 'v%d.%d' "$MAJOR" "$MINOR"
else
printf 'v%d.%d.%d' "$MAJOR" "$MINOR" "$COUNT"
fi