From 5b4d68bc82c4fafbcf8b0580c707e0d1fd0d4c99 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 19 Jun 2013 11:59:00 +0200 Subject: [PATCH] rename-tests: rework some code for clarity and safety Signed-off-by: Stefano Lattarini --- maintainer/rename-tests | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/maintainer/rename-tests b/maintainer/rename-tests index bdbd791..ca65e34 100755 --- a/maintainer/rename-tests +++ b/maintainer/rename-tests @@ -20,6 +20,7 @@ set -e -u me=${0##*/} msg_file=$me.git-msg + fatal () { echo "$me: $*" >&2; exit 1; } case $# in @@ -37,15 +38,16 @@ SED=${SED-sed} $SED --version 2>&1 | grep GNU >/dev/null 2>&1 \ || fatal "GNU sed is required by this script" -# Validate and cleanup input. +# Input validation and cleanup. input=$( - $AWK -v me="$me" " + $AWK -v me="$me" ' /^#/ { next; } (NF == 0) { next; } - (NF != 2) { print me \": wrong number of fields at line \" NR; + (NF != 2) { print me ": wrong number of fields at line " NR; exit(1); } - { printf (\"t/%s t/%s\\n\", \$1, \$2); } - " <<<"$input") + { printf ("t/%s t/%s\n", $1, $2); } + ' <<<"$input" +) || exit $? # Prepare git commit message. exec 5>"$msg_file" -- 2.7.4