From 3bed138fda9b013c22cf9df685624d04e022bd95 Mon Sep 17 00:00:00 2001 From: Lyndon Brown <jnqnfe@gmail.com> Date: Sat, 14 Mar 2020 04:33:23 +0000 Subject: [PATCH] stagefiles: avoid stagename in required error the name of the stage is already printed earlier in the output prior to the error here being printed. so the error really does not need to include the script name itself. --- functions/stagefile.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/functions/stagefile.sh b/functions/stagefile.sh index 2fd757971..85e318600 100755 --- a/functions/stagefile.sh +++ b/functions/stagefile.sh @@ -82,13 +82,10 @@ Require_stagefile () return 0 fi - local NAME - NAME="$(basename ${0})" - if [ $# -eq 1 ]; then - Echo_error "%s requires stage: %s" "${NAME}" "${FILE}" + Echo_error "the following stage is required to be completed first: %s" "${FILE}" else - Echo_error "%s requires the following stages: %s" "${NAME}" "$(echo ${@})" + Echo_error "the following stages are required to be completed first: %s" "$(echo ${@})" fi exit 1