From d5376df74caf104087d904ad06b347caf320853b Mon Sep 17 00:00:00 2001
From: "Steffen (Daode) Nurpmeso" <steffen@sdaoden.eu>
Date: Fri, 16 Dec 2016 15:56:55 +0100
Subject: [PATCH] mk-release.inc: automatic handling of symbolic release names

---
 mk-release.inc | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/mk-release.inc b/mk-release.inc
index d57f2f0b..acc99f18 100644
--- a/mk-release.inc
+++ b/mk-release.inc
@@ -92,6 +92,23 @@ if [ -z "${brref}" ]; then :; else
    exit 5
 fi
 
+RELSYM=
+stblmsg= relmsg=
+if yesno 'Shall '${PROGRAM}' v'${REL}' have a symbolic name?'; then
+   printf '  ..and it shall be known as: '
+   read RELSYM
+   if yesno 'Is '"${RELSYM}"' correct?'; then :; else
+      echo >&2 'Bailing out'
+      exit 3
+   fi
+   stblmsg="Bump ${UPROGRAM} v${REL} (\"${RELSYM}\"), ${DATE_ISO}"
+   relmsg="Bump ${UPROGRAM} v${REL}.ar (\"${RELSYM}\"), ${DATE_ISO}"
+   RELSYM=" (\"${RELSYM}\")"
+else
+   stblmsg="Bump ${UPROGRAM} v${REL}, ${DATE_ISO}"
+   relmsg="Bump ${UPROGRAM} v${REL}.ar, ${DATE_ISO}"
+fi
+
 ##
 echo 'Updating stable/ files to match the release'
 
@@ -101,9 +118,8 @@ if [ -f version.h ] && [ -f mk-mk.in ]; then
 fi
 update_stable_hook
 
-LC_ALL=${ORIG_LC_ALL} git commit -S -m "Bump ${UPROGRAM} v${REL}, ${DATE_ISO}"
-LC_ALL=${ORIG_LC_ALL} git tag -s -f \
-   -m "Bump ${UPROGRAM} v${REL}, ${DATE_ISO}" "v${REL}"
+LC_ALL=${ORIG_LC_ALL} git commit -S -m "${stblmsg}"
+LC_ALL=${ORIG_LC_ALL} git tag -s -f -m "${stblmsg}" v${REL}
 
 ##
 
@@ -113,10 +129,8 @@ if yesno 'Create release/ branch?'; then
    git rm -f .gitignore .mailmap TODO mk-release.*
    update_release_hook
 
-   LC_ALL=${ORIG_LC_ALL} git commit -S \
-      -m "Bump ${UPROGRAM} v${REL}.ar, ${DATE_ISO}"
-   LC_ALL=${ORIG_LC_ALL} git tag -s -f \
-      -m "Bump ${UPROGRAM} v${REL}.ar, ${DATE_ISO}" "v${REL}.ar"
+   LC_ALL=${ORIG_LC_ALL} git commit -S -m "${relmsg}"
+   LC_ALL=${ORIG_LC_ALL} git tag -s -f -m "${relmsg}" v${REL}.ar
 
    if yesno 'Shall i update release/latest "symlink"?'; then
       git update-ref refs/heads/release/latest ${relbrname}
@@ -138,7 +152,7 @@ if [ ${relbrname} != ${stblbrname} ] &&
    git rm -rf '*'
    git archive --format=tar "v${REL}.ar" | tar -x -f -
    git add .
-   LC_ALL=${ORIG_LC_ALL} git commit -S -m "${UPROGRAM} v${REL}.ar, ${DATE_ISO}"
+   LC_ALL=${ORIG_LC_ALL} git commit -S -m "${relmsg}"
 fi
 
 ##
@@ -155,7 +169,7 @@ if [ ${relbrname} != ${stblbrname} ] && yesno 'Create tarballs?'; then
    bigballs=y
    (
    # Repack with standard tar(1) to avoid new-style headers
-   git archive --format=tar --prefix="${PROGRAM}-${REL}/" "v${REL}.ar" |
+   git archive --format=tar --prefix="${PROGRAM}-${REL}/" v${REL}.ar |
       ( cd "${TMPDIR}" && tar -x -f - )
    cd "${TMPDIR}"
 
@@ -185,10 +199,9 @@ fi
 
 if yesno 'Prepare announcement?'; then
    anntxt=y
+   { echo "${relmsg}"; echo; } > "${TMPDIR}/${PROGRAM}-${REL}.txt"
    if [ -f .git/mk-release.txt ]; then
-      cp .git/mk-release.txt "${TMPDIR}/${PROGRAM}-${REL}.txt"
-   else
-      : > "${TMPDIR}/${PROGRAM}-${REL}.txt"
+      cat .git/mk-release.txt >> "${TMPDIR}/${PROGRAM}-${REL}.txt"
    fi
    if [ -n "${bigballs}" ] && [ -f "${TMPDIR}/${PROGRAM}-${REL}.cksum" ]; then
       echo >> "${TMPDIR}/${PROGRAM}-${REL}.txt"
@@ -346,7 +359,7 @@ fi
 
 if [ -n "${anntxt}" ] && yesno 'Send announcement mail?'; then
    LC_ALL=${ORIG_LC_ALL} ${MAILX} -A ${ACCOUNT} \
-      -s "[ANN]ounce of ${UPROGRAM} v${REL}" \
+      -s "[ANN]ounce of ${UPROGRAM} v${REL}${RELSYM}" \
       -q "${TMPDIR}/${PROGRAM}-${REL}.txt" \
       -b ${MAILBCC} ${MAILTO}
 fi
-- 
2.11.4.GIT