From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 6/8] header-zone: refactor hook_config_edit Date: Wed, 05 Jul 2017 16:19:51 +0200 Message-ID: <1499264393-13700-6-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1499264393-13700-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7505611414575782135==" List-Id: --===============7505611414575782135== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit With the new id function this function gets a zone name and a id, but hook_config_cmd needs also the name of the hook. So this function now calls zone_config_get_hook_from_id to get the hook and calls then hook_config_cmd with the correct argument order. Signed-off-by: Jonatan Schlag --- src/header-zone | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/header-zone b/src/header-zone index fdd6e51..2e3fa09 100644 --- a/src/header-zone +++ b/src/header-zone @@ -225,7 +225,22 @@ hook_config_destroy() { } hook_config_edit() { - hook_config_cmd "edit" "$@" + assert [ $# -eq 2 ] + local zone=${1} + # The id must be the id and not the hid. + local id=${2} + + shift 2 + + # Check if we get a valid id + if ! zone_config_id_is_valid ${zone} ${id}; then + log ERROR "ID: ${id} is not a valid id for zone ${zone}" + fi + + local hook=$(zone_config_get_hook_from_id ${zone} ${id}) + assert isset hook + + hook_config_cmd "edit" "${zone}" "${hook}" "${hook}.${id}" "$@" } hook_config_show() { -- 2.6.3 --===============7505611414575782135==--