allow turning off colour

necessary to give control when colour is default enabled

Gbp-Dch: Short
This commit is contained in:
Lyndon Brown 2020-03-11 21:30:58 +00:00 committed by Raphaël Hertzog
parent 2cf397df66
commit 49e68da5ee
3 changed files with 17 additions and 2 deletions

View File

@ -12,7 +12,7 @@
Arguments ()
{
local ERR=0
ARGUMENTS="$(getopt --longoptions breakpoints,color,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options c:huv --shell sh -- "${@}")" || ERR=$?
ARGUMENTS="$(getopt --longoptions breakpoints,color,no-color,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options c:huv --shell sh -- "${@}")" || ERR=$?
if [ $ERR -eq 1 ]; then
Echo_error "invalid arguments"
@ -37,6 +37,11 @@ Arguments ()
shift
;;
--no-color)
_COLOR="false"
shift
;;
-c|--conffile)
_CONFFILE="${2}"
shift 2

View File

@ -185,6 +185,8 @@
[\fB\-\-net\-root\-server\fR \fIIP\fR|\fIHOSTNAME\fR]
.br
[\fB\-\-net\-tarball\fR true|false]
.br
[\fB\-\-no\-color]
.br
[\fB\-\-onie\fR true|false]
.br
@ -434,6 +436,8 @@ sets the file path that will be configured in the bootloader configuration for y
sets the IP or hostname that will be configured in the bootloader configuration for the root filesystem of your netboot image. This defaults to 192.168.1.1.
.IP "\fB\-\-net\-tarball\fR true|false" 4
defines if a compressed tarball should be created. Disabling this options leads to no tarball at all, the plain binary directory is considered the output in this case. Default is true.
.IP "\fB\-\-no\-color\fR" 4
turns off color in the messages.
.IP "\fB\-\-onie\fR true|false" 4
defines if an ONIE.bin image is generated. ONIE binaries can be loaded by supported systems, and will in turn boot the live image. Note that ISO or hybrid-iso are the only formats supported. For more information visit <\fIhttp://onie.org/\fR>. Default is false.
.IP "\fB\-\-onie\-kernel\-cmdline\fR \fI""OPTION1 OPTION2""\fR" 4

View File

@ -106,6 +106,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--net-root-path PATH]\n\
\t [--net-root-server IP|HOSTNAME]\n\
\t [--net-tarball true|false]\n\
\t [--no-color]\n\
\t [--onie true|false]\n\
\t [--onie-kernel-cmdline \"OPTION1 OPTION2\"]\n\
\t [--parent-archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
@ -157,7 +158,7 @@ Local_arguments ()
iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,
net-cow-server:,net-tarball:,onie:,onie-kernel-cmdline:,firmware-binary:,firmware-chroot:,swap-file-path:,swap-file-size:,
loadlin:,win32-loader:,source:,source-images:,breakpoints,conffile:,color,debug,force,
loadlin:,win32-loader:,source:,source-images:,breakpoints,conffile:,color,no-color,debug,force,
help,ignore-system-defaults,quiet,usage,verbose,version,bootstrap-qemu-static:,bootstrap-qemu-arch:,
uefi-secure-boot:,
bootstrap-qemu-exclude:"
@ -777,6 +778,11 @@ Local_arguments ()
shift
;;
--no-color)
_COLOR="false"
shift
;;
--debug)
_DEBUG="true"
shift