From 3823408b6063c8955d22532903f96b40601f57ed Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 7 Feb 2020 08:11:45 +0100 Subject: [PATCH] SCRIPTS: announce-release: allow the user to force to overwrite old files When starting the script multiple times, one had to remove the previous files by hand. Now with -f it's not needed anymore, they get removed. --- scripts/announce-release | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) mode change 100755 => 100644 scripts/announce-release diff --git a/scripts/announce-release b/scripts/announce-release old mode 100755 new mode 100644 index ff32d3243..b04c89d74 --- a/scripts/announce-release +++ b/scripts/announce-release @@ -10,7 +10,8 @@ # - creates web-$version.html # - indicates how to edit the mail and how to send it -USAGE="Usage: ${0##*/} [-b branch] [-d date] [-o oldver] [-n newver]" +USAGE="Usage: ${0##*/} [-f] [-b branch] [-d date] [-o oldver] [-n newver]" +FORCE= OUTPUT= BRANCH= HTML= @@ -38,6 +39,7 @@ while [ -n "$1" -a -z "${1##-*}" ]; do case "$1" in -d) DATE="$2" ; shift 2 ;; -b) BRANCH="$2" ; shift 2 ;; + -f) FORCE=1 ; shift ;; -o) OLD="$2" ; shift 2 ;; -n) NEW="$2" ; shift 2 ;; -h|--help) quit "$USAGE" ;; @@ -108,13 +110,16 @@ fi YEAR="${DATE%%/*}" OUTPUT="$DIR/mail-haproxy-$NEW.txt" +HTML="$DIR/web-haproxy-$NEW.html" + +[ -z "$FORCE" ] || rm -f "${OUTPUT}" "${HTML}" + if [ -e "$OUTPUT" ]; then - die "$OUTPUT already exists, please remove it." + die "${OUTPUT##*/} already exists, please remove it or retry with -f." fi -HTML="$DIR/web-haproxy-$NEW.html" if [ -e "$HTML" ]; then - die "$HTML already exists, please remove it." + die "$HTML already exists, please remove it or retry with -f." fi (