From 6ebc0549480fe03924add074cc4e605a0476674d Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 30 Jun 2018 10:06:45 -0400 Subject: consistency --- make_changelog.sh | 6 ++++-- make_tag.sh | 8 ++++++++ maketag.sh | 8 -------- 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100755 make_tag.sh delete mode 100755 maketag.sh diff --git a/make_changelog.sh b/make_changelog.sh index ea950eed..73a02185 100755 --- a/make_changelog.sh +++ b/make_changelog.sh @@ -3,5 +3,7 @@ if [ -z "$1" ]; then exit fi -read -p "Future release is $1. Please press any key to confirm..." -github_changelog_generator -u pliablepixels -p zmNinja --future-release $1 +orig=$1 +VER="${orig/v/}" +read -p "Future release is v${VER}. Please press any key to confirm..." +github_changelog_generator -u pliablepixels -p zmNinja --future-release v${VER} diff --git a/make_tag.sh b/make_tag.sh new file mode 100755 index 00000000..b91e9fb6 --- /dev/null +++ b/make_tag.sh @@ -0,0 +1,8 @@ +#!/bin/bash +read -p "Please generate CHANGELOG and commit it BEFORE you tag. Press a key when ready..." +orig=$1 +VER="${orig/v/}" +echo "Creating tag:v$VER" +read -p "Press any key to create the tag or Ctrl-C to break..." -n1 +git tag -fa v$VER -m"v$VER" +git push -f --tags diff --git a/maketag.sh b/maketag.sh deleted file mode 100755 index b91e9fb6..00000000 --- a/maketag.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -read -p "Please generate CHANGELOG and commit it BEFORE you tag. Press a key when ready..." -orig=$1 -VER="${orig/v/}" -echo "Creating tag:v$VER" -read -p "Press any key to create the tag or Ctrl-C to break..." -n1 -git tag -fa v$VER -m"v$VER" -git push -f --tags -- cgit v1.2.3