fix usage/help/man bugs
- the definition of $PROGRAM as used in $USAGE strings defined in each script has been broken for a long time, being simply "lb" when it needs to be "lb COMMAND". - `config` changed $PROGRAM to "lb config" thus its output was correct in this regard unlike everything else, but with the switch to a more "intelligent" `Man()` function recently, it means that instead of `man lb config`, what was actually run was `man lb config config`, which displayed the manpage, then on exiting with `q`, it showed some sort of index line todo with a "config" search (no exact manpage match?), for which you had to enter `ctrl+c` to get rid of. this revises things to fix the issues, minimising change by changing $PROGRAM to "lb COMMAND", with the frontend overriding this. Gbp-Dch: Ignore
This commit is contained in:
parent
96c7977732
commit
7276d0213f
|
@ -15,6 +15,7 @@ set -e
|
|||
[ -n "${LIVE_BUILD}" ] && [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
|
||||
|
||||
# Setting static variables
|
||||
PROGRAM="${FRONTEND}"
|
||||
DESCRIPTION="Utility to build live systems"
|
||||
HELP=""
|
||||
USAGE="lb {clean|config|build}"
|
||||
|
|
|
@ -16,7 +16,7 @@ Arguments ()
|
|||
|
||||
local ARGUMENTS
|
||||
local ERR=0
|
||||
ARGUMENTS="$(getopt --shell sh --name ${PROGRAM} --longoptions $LONGOPTS --options $SHORTOPTS -- "${@}")" || ERR=$?
|
||||
ARGUMENTS="$(getopt --shell sh --name "${PROGRAM}" --longoptions $LONGOPTS --options $SHORTOPTS -- "${@}")" || ERR=$?
|
||||
|
||||
if [ $ERR -eq 1 ]; then
|
||||
Echo_error "invalid argument(s)"
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
|
||||
|
||||
PROGRAM_NAME="live-build"
|
||||
PROGRAM="lb"
|
||||
FRONTEND="lb"
|
||||
PROGRAM="${FRONTEND} $(basename "${0}")"
|
||||
VERSION="$(if [ -e ${LIVE_BUILD}/debian/changelog ]; then sed -e 's/.*(\(.*\)).*/\1/; s/^[0-9]://; q' ${LIVE_BUILD}/debian/changelog; else cat /usr/share/live/build/VERSION; fi)"
|
||||
|
||||
LIVE_BUILD_VERSION="${VERSION}"
|
||||
|
|
|
@ -11,18 +11,8 @@
|
|||
|
||||
Man ()
|
||||
{
|
||||
local BASENAME
|
||||
BASENAME=$(basename ${0})
|
||||
if command -v man >/dev/null
|
||||
then
|
||||
case $BASENAME in
|
||||
$PROGRAM)
|
||||
man ${PROGRAM}
|
||||
;;
|
||||
*)
|
||||
man ${PROGRAM} $(basename ${0})
|
||||
;;
|
||||
esac
|
||||
if command -v man >/dev/null; then
|
||||
man ${PROGRAM}
|
||||
else
|
||||
Echo_warning "man is not installed, falling back to usage output."
|
||||
Usage
|
||||
|
|
|
@ -15,7 +15,6 @@ set -e
|
|||
[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
|
||||
|
||||
# Setting static variables
|
||||
PROGRAM="lb config"
|
||||
DESCRIPTION="Create configuration for live-build(7)"
|
||||
USAGE="${PROGRAM} [--apt apt|apt-get|aptitude]\n\
|
||||
\t [--apt-ftp-proxy URL]\n\
|
||||
|
|
Loading…
Reference in New Issue