From d451600b1b601c242979cae99f7c915f86742ec4 Mon Sep 17 00:00:00 2001 From: Ryan Parman Date: Mon, 20 Nov 2023 14:07:46 -0800 Subject: [PATCH] style: Minor adjustments to the Makefile and author script. --- AUTHORS | 6 +++--- Makefile | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/AUTHORS b/AUTHORS index d9d45411..ca2a6935 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ - # File @generated by scripts/generate-authors.sh. DO NOT EDIT. - # This file lists all contributors to the repository. - # See scripts/generate-authors.sh to make modifications. +# File @generated by scripts/generate-authors.sh. DO NOT EDIT. +# This file lists all contributors to the repository. +# See scripts/generate-authors.sh to make modifications. dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Ryan Parman diff --git a/Makefile b/Makefile index c4d91e04..f6339d2f 100644 --- a/Makefile +++ b/Makefile @@ -386,23 +386,23 @@ changelog: tag: @ if [ $$(git status -s -uall | wc -l) != 1 ]; then echo 'ERROR: Git workspace must be clean.'; exit 1; fi; - @echo "This release will be tagged as: $$(cat ./VERSION)" - @echo "This version should match your release. If it doesn't, re-run 'make version'." - @echo "---------------------------------------------------------------------" - @read -p "Press any key to continue, or press Control+C to cancel. " x; + @ $(ECHO) "This release will be tagged as: v$$(cat ./VERSION)" + @ $(ECHO) "This version should match your release. If it doesn't, re-run 'make version'." + @ $(ECHO) "---------------------------------------------------------------------" + @ read -p "Press any key to continue, or press Control+C to cancel. " x; - @echo " " - @chag update $$(cat ./VERSION) - @echo " " + @ $(ECHO) " " + @ chag update v$$(cat ./VERSION) + @ $(ECHO) " " - @echo "These are the contents of the CHANGELOG for this release. Are these correct?" - @echo "---------------------------------------------------------------------" - @chag contents - @echo "---------------------------------------------------------------------" - @echo "Are these release notes correct? If not, cancel and update CHANGELOG.md." - @read -p "Press any key to continue, or press Control+C to cancel. " x; + @ $(ECHO) "These are the contents of the CHANGELOG for this release. Are these correct?" + @ $(ECHO) "---------------------------------------------------------------------" + @ chag contents + @ $(ECHO) "---------------------------------------------------------------------" + @ $(ECHO) "Are these release notes correct? If not, cancel and update CHANGELOG.md." + @ read -p "Press any key to continue, or press Control+C to cancel. " x; - @echo " " + @ $(ECHO) " " git add . git commit -a -m "relprep: Preparing the $$(cat ./VERSION) release." @@ -411,6 +411,6 @@ tag: .PHONY: version ## version: [release]* Sets the version for the next release; pre-req for a release tag. version: - @echo "Current version: $$(cat ./VERSION)" + @ $(ECHO) "Current version: $$(cat ./VERSION)" @read -p "Enter new version number: " nv; \ printf "$$nv" > ./VERSION