Revert "frontend: properly handle option processing"
This reverts commit 6b7c8ed4bf as it's
breaking multi-value space-separated parameters.
This commit is contained in:
Raphaël Hertzog
parent
58e0efedc9
commit
104fa20399
25
frontend/lb
25
frontend/lb
|
|
@ -19,14 +19,25 @@ DESCRIPTION="Utility to build live systems"
|
|||
HELP=""
|
||||
USAGE="lb {clean|config|build}"
|
||||
|
||||
# Handle options up to any command
|
||||
# We replace the arg set with any remaining args on return
|
||||
Arguments frontend "${@}"
|
||||
eval set -- "${REMAINING_ARGS}"
|
||||
case "${1}" in
|
||||
-h|--help)
|
||||
if [ $(which man) ]; then
|
||||
man lb
|
||||
else
|
||||
Usage
|
||||
fi
|
||||
exit 0
|
||||
;;
|
||||
|
||||
if [ -z "${1}" ]; then
|
||||
Usage --fail
|
||||
fi
|
||||
""|-u|--usage)
|
||||
Usage
|
||||
;;
|
||||
|
||||
-v|--version)
|
||||
echo "${VERSION}"
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
COMMAND="${1}"
|
||||
shift
|
||||
|
|
|
|||
|
|
@ -11,84 +11,23 @@
|
|||
|
||||
Arguments ()
|
||||
{
|
||||
# This function is used for handling arguments both at the frontend (`lb`)
|
||||
# level and at the command level, since both accept almost the same basic
|
||||
# argument set, with little difference in response to them.
|
||||
#
|
||||
# We enlist the help of getopt here which takes care of some of the
|
||||
# intricacies of parsing for us. Note that getopt does not itself
|
||||
# understand the concept of "command" arguments, and the behaviour of it
|
||||
# shuffling non-options (those arguments that are not options or option
|
||||
# values) to the end of the argument list would present a difficulty, if it
|
||||
# were not for the fact that you can control this behaviour with use of the
|
||||
# `POSIXLY_CORRECT` environment variable; setting this variable causes
|
||||
# getopt to stop parsing arguments once it encounters the first non-option,
|
||||
# treating all remaining arguments as being non-options. Note also that
|
||||
# getopt always outputs a `--` separator argument between option (including
|
||||
# option value) arguments and non-option arguments.
|
||||
#
|
||||
# At the frontend we need getopt to only parse options up to the point of
|
||||
# a command. A command as far as getopt is concerned is simply a
|
||||
# "non-option" argument. Using the above mentioned `POSIXLY_CORRECT`
|
||||
# environment variable when parsing for the frontend, we can thus have
|
||||
# getopt process options up to the first non-option, if given, which should
|
||||
# be our command. We can then pass back any remaining arguments including
|
||||
# the command argument, for a second command-stage handling. If no command
|
||||
# is given, this is trivial to handle. If an invalid option is used before
|
||||
# a command, this is caught by getopt.
|
||||
#
|
||||
# When a command is run, it is passed all remaining arguments, with most
|
||||
# scripts then passing them to this function, with argument parsing then
|
||||
# occurring in command-context, which just so happens to use almost the same
|
||||
# set of arguments for most scripts (the config command is a notable
|
||||
# exception).
|
||||
#
|
||||
# It is true that many of the common options have no effect in the frontend
|
||||
# currently, but some do, such as colour control, and others could do in
|
||||
# future or during development.
|
||||
#
|
||||
# Note, do not worry about options unavailable in frontend mode being
|
||||
# handled in the case statement, they will never reach there if used for the
|
||||
# frontend (i.e. before a command), they will result in an invalid option
|
||||
# error!
|
||||
|
||||
local LONGOPTS="breakpoints,color,debug,help,no-color,quiet,usage,verbose,version"
|
||||
local SHORTOPTS="huv"
|
||||
|
||||
local IS_FRONTEND="false"
|
||||
if [ "${1}" = "frontend" ]; then
|
||||
shift
|
||||
IS_FRONTEND="true"
|
||||
else
|
||||
LONGOPTS="${LONGOPTS},force"
|
||||
fi
|
||||
|
||||
local GETOPT_ARGS="--name=${PROGRAM} --shell sh --longoptions $LONGOPTS --options $SHORTOPTS"
|
||||
|
||||
local ARGUMENTS
|
||||
local ERR=0
|
||||
if [ "${IS_FRONTEND}" = "true" ]; then
|
||||
ARGUMENTS="$(export POSIXLY_CORRECT=1; getopt $GETOPT_ARGS -- "${@}")" || ERR=$?
|
||||
else
|
||||
ARGUMENTS="$(getopt $GETOPT_ARGS -- "${@}")" || ERR=$?
|
||||
fi
|
||||
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 argument(s)"
|
||||
Echo_error "invalid arguments"
|
||||
exit 1
|
||||
elif [ $ERR -ne 0 ]; then
|
||||
Echo_error "getopt failure"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Replace arguments with result of getopt processing (e.g. with non-options shuffled to end)
|
||||
# Note that this only affects this function's parameter set, not the calling function's or
|
||||
# calling script's argument set.
|
||||
eval set -- "${ARGUMENTS}"
|
||||
|
||||
local ARG
|
||||
for ARG in "$@"; do
|
||||
case "${ARG}" in
|
||||
while true
|
||||
do
|
||||
case "${1}" in
|
||||
--breakpoints)
|
||||
_BREAKPOINTS="true"
|
||||
shift
|
||||
|
|
@ -119,16 +58,8 @@ Arguments ()
|
|||
;;
|
||||
|
||||
-h|--help)
|
||||
if [ $(which man) ]; then
|
||||
if [ "${IS_FRONTEND}" = "true" ]; then
|
||||
man ${PROGRAM}
|
||||
else
|
||||
man ${PROGRAM} $(basename ${0})
|
||||
fi
|
||||
exit 0
|
||||
elif [ "${IS_FRONTEND}" = "true" ]; then
|
||||
Usage --exit
|
||||
fi
|
||||
Man
|
||||
shift
|
||||
;;
|
||||
|
||||
--quiet)
|
||||
|
|
@ -157,17 +88,9 @@ Arguments ()
|
|||
;;
|
||||
|
||||
*)
|
||||
if [ "${IS_FRONTEND}" = "true" ]; then
|
||||
# We have handled all frontend options up to what we assume to be a command
|
||||
break
|
||||
fi
|
||||
Echo_error "Internal error, unhandled option: %s" "${ARG}"
|
||||
Echo_error "internal error %s" "${0}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Return remaining args
|
||||
# Much more simple than trying to deal with command substitution.
|
||||
REMAINING_ARGS="$@"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,14 +25,7 @@ Auto_build_config ()
|
|||
|
||||
Init_config_data ()
|
||||
{
|
||||
# Here we ignore the consumption of option arguments, we would have to return REMAINING_ARGS
|
||||
# for use in a `set -- $REMAINING_ARGS` (or `eval set -- "$REMAINING_ARGS"`) if we wanted to
|
||||
# remove them from the set of args for calling scripts to make use of, in which case we might
|
||||
# as well just move use of the function out of here. Note that currently scripts taking args
|
||||
# like `$_PASS` do so as the first arg to the script, thus then just ignore any following
|
||||
# option args (and capture them before arg processing takes place).
|
||||
Arguments "${@}"
|
||||
unset REMAINING_ARGS
|
||||
|
||||
Read_conffiles $(Common_config_files)
|
||||
Prepare_config
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
#!/bin/sh
|
||||
|
||||
## live-build(7) - System Build Scripts
|
||||
## Copyright (C) 2016-2020 The Debian Live team
|
||||
## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
|
||||
##
|
||||
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
|
||||
## This is free software, and you are welcome to redistribute it
|
||||
## under certain conditions; see COPYING for details.
|
||||
|
||||
|
||||
Man ()
|
||||
{
|
||||
if [ $(which man) ]
|
||||
then
|
||||
man ${PROGRAM} $(basename ${0})
|
||||
exit 0
|
||||
fi
|
||||
}
|
||||
|
|
@ -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 argument(s)"
|
||||
Echo_error "invalid arguments"
|
||||
exit 1
|
||||
elif [ $ERR -ne 0 ]; then
|
||||
Echo_error "getopt failure"
|
||||
|
|
|
|||
Loading…
Reference in New Issue