diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..8acdd82 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.1 diff --git a/release.sh b/release.sh index 09e3d2d..678fd58 100755 --- a/release.sh +++ b/release.sh @@ -11,12 +11,6 @@ # file in which to update version number FILE_VERSION="VERSION" FILE_CHANGELOG="CHANGELOG.md" -FORCE="0" - -if [ $1 = '-f' ]; then - FORCE="1" -fi - NOW="$(date +'%B %d, %Y')" RED="\033[1;31m" @@ -90,28 +84,26 @@ if [ "$NEW_VERSION" = "" ]; then NEW_VERSION=$SUGGESTED_VERSION fi echo -e "${NOTICE_FLAG} Will set new version to be ${WHITE}$NEW_VERSION" - -if [ "$FORCE" = "0" ]; then - echo -ne "${WARNING_FLAG} This is the last chance to bail out before anything has happened." - read -fi +echo "" +echo -ne "${WARNING_FLAG} This is the last chance to bail out before anything has happened." +read # Set up our release branch name BRANCH_RELEASE=release-$NEW_VERSION # create the release branch from the -develop branch -#git checkout -b $BRANCH_RELEASE $BRANCH_DEV +git checkout -b $BRANCH_RELEASE $BRANCH_DEV # Set our new version to our version file -#echo $NEW_VERSION > $FILE_VERSION +echo $NEW_VERSION > $FILE_VERSION # Create our changelog -#echo "## $NEW_VERSION ($NOW)" > tmpfile -#git log --pretty=format:" - %s" "$BASE_STRING"...HEAD >> tmpfile -#echo "" >> tmpfile -#echo "" >> tmpfile -#cat $FILE_CHANGELOG >> tmpfile -#mv tmpfile $FILE_CHANGELOG +echo "## $NEW_VERSION ($NOW)" > tmpfile +git log --pretty=format:" - %s" "$BASE_STRING"...HEAD >> tmpfile +echo "" >> tmpfile +echo "" >> tmpfile +cat $FILE_CHANGELOG >> tmpfile +mv tmpfile $FILE_CHANGELOG echo -e "$ADJUSTMENTS_MSG" read