summaryrefslogtreecommitdiff
path: root/scripts/build/config
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-18 01:51:53 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 16:29:00 +0200
commit6b7c8ed4bf15175299729355f04d60dcbac1aded (patch)
tree41c5a7b3ea23cf5a601432d00850c03debb26b42 /scripts/build/config
parent89e965ccae38e46e0dda0eb5746a0960ca606589 (diff)
downloadvyos-live-build-6b7c8ed4bf15175299729355f04d60dcbac1aded.tar.gz
vyos-live-build-6b7c8ed4bf15175299729355f04d60dcbac1aded.zip
frontend: properly handle option processing
this means that the usage goes from: lb {-h|--help|-u|--usage|-v|--version} lb COMMAND [OPTIONS] to: lb {-h|--help|-u|--usage|-v|--version} lb [FRONTEND_OPTIONS] COMMAND [COMMAND_OPTIONS] though it is probably not worth is to update the description in the manpages...? hmm... so for instance this matters for color control with --color|--no-color (you already had full control via environment vars). previously you could do `lb COMMAND --no-color` to turn off colour, only to find that output at the frontend level was still coloured (the option is processed at the command context level, not the frontend), so you might try to instead use `lb --no-color COMMAND`, only to find that this was not supported. Well now it is, and used at the frontend level will fully control colour output (after the command is processed anyway). the full set of common options are thus available (except --force) at the frontend level, and thus for instance all Echo_*() helpers used in the frontend will work correctly after args are processed. furthermore usage like `lb --color --help` will actually work. (not that color is used there, but this previously would have failed with the frontend treating the `--color` argument as the command; that's the point!) Gbp-Dch: Short
Diffstat (limited to 'scripts/build/config')
-rwxr-xr-xscripts/build/config2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build/config b/scripts/build/config
index 05239eae6..9805e2af0 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -179,7 +179,7 @@ Local_arguments ()
ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name="${PROGRAM}" --options a:d:m:k:b:s:c:huv --shell sh -- "${@}")" || ERR=$?
if [ $ERR -eq 1 ]; then
- Echo_error "invalid arguments"
+ Echo_error "Invalid argument(s)"
exit 1
elif [ $ERR -ne 0 ]; then
Echo_error "getopt failure"