diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-30 06:41:00 +0100 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-23 11:52:13 +0100 |
| commit | 6b734df9f32914049b9a6e2291bda5c5b133b4bb (patch) | |
| tree | 56764cd710915cebb3136e9ec490bd2b9ef7f6c0 | |
| parent | e4134e1583684255890a906a87b30df622f44ee1 (diff) | |
| download | vyos-live-build-6b734df9f32914049b9a6e2291bda5c5b133b4bb.tar.gz vyos-live-build-6b734df9f32914049b9a6e2291bda5c5b133b4bb.zip | |
fix incorrect handling of -c|--conffile
this option actually only has an impact when used for `lb config`; it thus
was incorrectly accepted and captured by Arguments() and the documentation
was wrong.
going back through git history, this has been incorrect since the v0.99 days.
also, reorganised the list alphabetically (no-color was inserted in the
wrong place).
Gbp-Dch: Short
| -rwxr-xr-x | functions/arguments.sh | 7 | ||||
| -rw-r--r-- | manpages/en/live-build.7 | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/functions/arguments.sh b/functions/arguments.sh index 292bdd548..4f6105649 100755 --- a/functions/arguments.sh +++ b/functions/arguments.sh @@ -13,7 +13,7 @@ Arguments () { local ARGUMENTS local ERR=0 - ARGUMENTS="$(getopt --longoptions breakpoints,color,no-color,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options c:huv --shell sh -- "${@}")" || ERR=$? + ARGUMENTS="$(getopt --longoptions breakpoints,color,debug,force,help,no-color,quiet,usage,verbose,version --name=${PROGRAM} --options huv --shell sh -- "${@}")" || ERR=$? if [ $ERR -eq 1 ]; then Echo_error "invalid arguments" @@ -47,11 +47,6 @@ Arguments () shift ;; - -c|--conffile) - _CONFFILE="${2}" - shift 2 - ;; - --debug) _DEBUG="true" shift diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 9922070e5..236aeef84 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -33,8 +33,6 @@ The following command line options are supported by most live\-build programs. S run with breakpoints. .IP "\fB\-\-color\fR" 4 enable color use in messages. -.IP "\fB\-\-conffile\fR" 4 -use custom configuration file. .IP "\fB\-\-debug\fR" 4 show debug information. .IP "\fB\-\-force\fR" 4 |