diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-14 04:33:23 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-17 22:57:09 +0000 |
| commit | 3bed138fda9b013c22cf9df685624d04e022bd95 (patch) | |
| tree | c5d0e6ad403dedcce2759a73217822dff97fd27c | |
| parent | ea0f6b7810e67cc5176b757db06dc3db8664c657 (diff) | |
| download | vyos-live-build-3bed138fda9b013c22cf9df685624d04e022bd95.tar.gz vyos-live-build-3bed138fda9b013c22cf9df685624d04e022bd95.zip | |
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.
| -rwxr-xr-x | functions/stagefile.sh | 7 |
1 files 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 |