From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: network@lists.ipfire.org
Subject: Re: [PATCH 3/8] zone: config list print also hids
Date: Tue, 25 Jul 2017 23:28:18 +0100
Message-ID: <1501021698.20312.34.camel@ipfire.org>
In-Reply-To: <1500998833-10543-4-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2074548966966853216=="
List-Id: <network.lists.ipfire.org>

--===============2074548966966853216==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

This looks good.

It might be better to print just "-" if there is no HID, but that only makes
parsing this output easier which nobody should be doing any ways...

-Michael

On Tue, 2017-07-25 at 18:07 +0200, Jonatan Schlag wrote:
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
>  src/functions/functions.zone | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/src/functions/functions.zone b/src/functions/functions.zone
> index 091bcd6..17d0858 100644
> --- a/src/functions/functions.zone
> +++ b/src/functions/functions.zone
> @@ -634,21 +634,22 @@ zone_config_list() {
>  	assert isset zone
>  
>  	# Print a nice header
> -	local format="%-3s %-20s"
> -	print "${format}" "ID" "HOOK"
> +	local format="%-3s %-20s %-20s"
> +	print "${format}" "ID" "HOOK" "HID"
>  
>  	local config
>  	local hook
>  	local id
> +	local hid
>  
>  	# Print for all config:
>  	# id and hook
> -	# TODO: Add hids here
>  	for config in $(zone_configs_list "${zone}"); do
>  		id=${config##*.}
>  		hook=$(zone_config_get_hook "${zone}" "${config}")
> +		hid=$(zone_config_get_hid "${zone}" "${config}")
>  		assert isset hook
> -		print "${format}" "${id}" "${hook}"
> +		print "${format}" "${id}" "${hook}" "${hid}"
>  	done
>  }
>  

--===============2074548966966853216==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlpkOFlDQUFvSkVJQjU4UDl2a0FrSDI4WVFBTFBjaG9xRDZDcXM1alNUU0NaUnJsY20K
c2tuWUdYTVArZjkrTG5sUSs5TGNja0dIZlJycUJraHR1MEVUU1NGVUUzTVI2UUc4OEQwWHJzc0cv
V2JSd01lYgpuUi80ME1kWmI2T2FCeFhNMElJL3BiRTZBcjFEOVZDZmU3aFh2SkkxcWxoZVMzUnI0
T01uME92N3BrL2lpR0FZCllidEZSY050VUdJcnZmVVl0cmhjdlphclMveCtuSGJyVkV0cEc2Ri9i
UFRNN1E0Zmp0K2hiMElvRG9KRFRXdlEKeE01N2lNTVY3MnBQRUhPYXNLMmVCK09GOEpGNWFVT2R6
K2R2bjN2K2IwcXVrVDZFWVRMbytBaXhGVEZyd3ZFVQozM1BaVVQ0Q1YvTXBuTlNJZDlnalU0WkNO
SHBqaUtTZ3pWbkZSSkVnQ202c3ZZTExFSXZGYmg4UGR5YTBrKzhQCkFSN0M1V3NDMGZXZmRZUjBJ
OTl4b0ZUcDlrSHBuRVdxbmtDemhqMjl1ZUlrcVpRV2ozUjk3Ym8rNzZpdTZWeVcKcjArdDdVRnkz
ajZNaUpPMjdMY2FPWUx4YlYvYnNPY3owZ0pKVzF2bzZ1dWRkWlpOSndCTFVyK3hNQUZEZStoOQpH
UWRIalkvNFBZV2lzaTNveHBrQlRoaEpyVnhTRW1Od2Znem9WeTFyRnI5QXdMZWRuWUk3WmduR0FL
VTkyaGFoClRMT1dxSDhHKzEyZTlERVhIN21tVUd3UnFIUUQwNmdUTUxDQWdhWXNBZmMzMFB1ZVpt
SDFPRm5FTlQ0VG1BczYKUFc5Q2JKU3RjMnpEM0xUSldBejZ0T0FwN1d4QnJvWm54bFQveFJJWi84
QVh0T0NaTkJzS3BqSVFOVmFkQkJFcgp0RkEzeEVDV083R3UzNHI4akg3NAo9SHlNMQotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============2074548966966853216==--