✨ Also add tag during bump_version

Author: cooperka

bump_version.sh

@@ -3,11 +3,12 @@
 # Simple utility to bump the version and commit the change (locally).
 #
 # @param $1 New version number to bump to.
+# @param $2 (optional) Extra string to add as a tag suffix.
 
 # Validate input.
-if [[ ! "$1" =~ ^[0-9\.]+$ ]]; then
+if [[ "$#" -lt 1 || "$#" -gt 2 ]] || [[ ! "$1" =~ ^[0-9\.]+$ ]]; then
   echo "Invalid params."
-  echo "Usage: $(basename $0) <version>, e.g. $(basename $0) 1.0.2"
+  echo "Usage: $(basename $0) <version> [<tag-suffix>], e.g. $(basename $0) 1.0.2 rc1"
   exit 1
 fi
 
@@ -17,7 +18,19 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 # Load common methods to call.
 source ./git_utils
 
-init_safe "About to bump version to $1 and commit locally."
+init_safe "About to bump version to $1 and commit locally. Any existing tag will be overwritten."
 
 echo;
 perform_version_bump "$1" "${PWD}"
+
+tag_string=''
+if [ "$2" ]; then
+  tag_string="v$1-$2"
+else
+  tag_string="v$1"
+fi
+
+git tag -f "${tag_string}"
+
+echo;
+echo 'Done.'

git_utils

@@ -24,7 +24,7 @@ init_safe() {
 # @see init_safe()
 init_with_warning() {
   echo 'Note: Please stash before continuing. Any existing changes will be lost.'
-  echo 'Note: This is a destructive action! It will delete the online branch.'
+  echo 'Note: This is a destructive action! It will overwrite the online branch.'
   echo;
 
   init_safe $1

git_utils.cfg

@@ -11,6 +11,7 @@ GIT_ALLOW_PUSH_TO_MASTER=false
 # @param $1 version name to update to.
 # @param $2 root directory of project.
 perform_version_bump() {
+  # Save the version number in a config file called 'example'.
   echo "$1" > "$2/example.cfg"
 
   # Commit the change.