[4/6] cli: print the color of a zone/port

Message ID 1497003452-10190-4-git-send-email-jonatan.schlag@ipfire.org
State Superseded
Headers show

Message

Jonatan Schlag June 9, 2017, 10:17 a.m.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 src/functions/functions.cli | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Comments

Michael Tremer June 14, 2017, 9:06 p.m. | #1
Hi,

On Fri, 2017-06-09 at 12:17 +0200, Jonatan Schlag wrote:
> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> ---
>  src/functions/functions.cli | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/src/functions/functions.cli
> b/src/functions/functions.cli
> index a4690b2..cd4fd06 100644
> --- a/src/functions/functions.cli
> +++ b/src/functions/functions.cli
> @@ -112,6 +112,12 @@ cli_device_headline() {
>  			;;
>  	esac
>  	cli_print_fmt1 1 "Status" "${status}"
> +
> +	# Print the color of the device.
> +	if [[ "${type}" == "zone" ]] || [[ "${type}" == "port" ]];
> then
> +		cli_print_fmt1 1 "Color " "$(cli_color ${type}
> ${device})"
> +	fi
> +

To compare two string values in shell you actually only use = instead
of ==.

I would probably have written this as:

case "${type}" in
	port|zone)
		...
		;;
esac

I always considered this performing faster.

>  	if enabled long; then
>  		cli_print_fmt1 1 "Address" "$(device_get_address
> ${device})"
>  	fi
> @@ -423,3 +429,15 @@ cli_show_man() {
>  
>  	man ${manpage}
>  }
> +
> +
> +cli_color() {

Whitespace again :)

> +	assert [ $# -eq 2 ]
> +
> +	local type=${1}
> +	local name=${2}
> +
> +	local color=$(color_read ${type} ${name})
> +
> +	echo "$(shell_set_color - ${color})            ${CLR_RESET}"
> +}