diff --git a/CHANGES b/CHANGES index a8c23c5..4fba94f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,5 @@ Version : + - Version bump to - Created jqt.make - Migrated generation to jq - Implementing external jq diff --git a/bin/jqt b/bin/jqt index edfdaec..d413d86 100755 --- a/bin/jqt +++ b/bin/jqt @@ -2,7 +2,7 @@ # jqt - jq based web template engine -declare -r VERSION='''0.5.0''0.4.0' +declare -r VERSION='''''0.5.0''0.4.0' declare -r DATADIR='/usr/local/share' declare -r SELF=${0##*/} diff --git a/bump-version.sh b/bump-version.sh index 74ca2c4..f844057 100755 --- a/bump-version.sh +++ b/bump-version.sh @@ -17,34 +17,34 @@ PUSH=${1:-No} if [[ -f VERSION ]]; then declare -r CURRENT_VERSION=$(&2 "Current version : $CURRENT_VERSION" + echo 1>&2 "Current version : ${CURRENT_VERSION}" set -- ${CURRENT_VERSION//./ } declare -i V_MAJOR=$1 V_MINOR=$2 V_PATCH=$3 V_MINOR+=1 V_PATCH=0 - declare -r SUGGESTED_VERSION="$V_MAJOR.$V_MINOR.$V_PATCH" - read 1>&2 -p "Enter a version number [$SUGGESTED_VERSION]: " - [[ -z $REPLY ]] && NEXT_VERSION=$SUGGESTED_VERSION - echo 1>&2 "Will set new version to be $NEXT_VERSION" - echo -n $NEXT_VERSION > VERSION - { echo "Version $NEXT_VERSION:" - git log --pretty=format:" - %s" "v$CURRENT_VERSION"...HEAD + declare -r SUGGESTED_VERSION="${V_MAJOR}.${V_MINOR}.${V_PATCH}" + read 1>&2 -p "Enter a version number [${SUGGESTED_VERSION}]: " + [[ -z $REPLY ]] && NEXT_VERSION=${SUGGESTED_VERSION} + echo 1>&2 "Will set new version to be ${NEXT_VERSION}" + echo -n ${NEXT_VERSION} > VERSION + { echo "Version ${NEXT_VERSION}:" + git log --pretty=format:" - %s" "v${CURRENT_VERSION}"...HEAD echo -e '\n' cat CHANGES } > /tmp/$$-changes cp /tmp/$$-changes CHANGES rm /tmp/$$-changes git add CHANGES VERSION - sed -i "s/^declare -r VERSION=/&'$NEXT_VERSION'/" bin/jqt - sed -i "s/\[version .*\]/[version $(NEXT_VERSION)]/" bin/jqt - sed -i "s/^Version *:=.*/Version := $(NEXT_VERSION)/" docs/Makefile - git commit -am "Version bump to $NEXT_VERSION" - git tag -a -m "Tagging version $NEXT_VERSION" "v$NEXT_VERSION" + sed -i "s/^declare -r VERSION=/&'${NEXT_VERSION}'/" bin/jqt + sed -i "s/\[version .*\]/[version ${NEXT_VERSION}]/" bin/jqt + sed -i "s/^Version *:=.*/Version := ${NEXT_VERSION}/" docs/Makefile + git commit -am "Version bump to ${NEXT_VERSION}" + git tag -a -m "Tagging version ${NEXT_VERSION}" "v${NEXT_VERSION}" [[ $PUSH == yes ]] && git push origin --tags else echo 1>&2 'Could not find a VERSION file' read 1>&2 -p 'Create a new VERSION file [y/yes]? ' - case $REPLY in + case ${REPLY} in ''|[Yy]|[Yy][Ee][Ss]) echo -n '0.1.0' > VERSION { echo 'Version 0.1.0' @@ -54,7 +54,7 @@ else git add VERSION CHANGES git commit -m 'Added VERSION and CHANGES files, version bump to v0.1.0' git tag -a -m 'Tagging version 0.1.0' 'v0.1.0' - [[ $PUSH == yes ]] && git push origin --tags + [[ ${PUSH} == yes ]] && git push origin --tags ;; *) echo 1>&2 'Ok' ;;