From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH 4/4] autocompletion: improve config part
Date: Mon, 24 Jul 2017 21:10:05 +0200
Message-ID: <1500923405-17258-4-git-send-email-jonatan.schlag@ipfire.org>
In-Reply-To: <1500923405-17258-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8426399320852754916=="
List-Id: <network.lists.ipfire.org>

--===============8426399320852754916==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/bash-completion/network | 46 +++++++++++++++++++++++++++++++++++++++++++=
+-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/bash-completion/network b/src/bash-completion/network
index f7c58a9..820c2d4 100644
--- a/src/bash-completion/network
+++ b/src/bash-completion/network
@@ -421,20 +421,64 @@ _network_zone_subcommand_config() {
=20
 	local words=3D( $@ )
=20
-	local commands=3D"new destroy"
+	local commands=3D"destroy list new $(network raw list-zone-config-ids ${zon=
e})"
+
 	local cmd=3D"$(_network_find_on_cmdline "${commands}")"
 	if [[ -z "${cmd}" ]]; then
 		COMPREPLY=3D( $(compgen -W "${commands}" -- "${cur}") )
 		return 0
 	fi
=20
+	local args=3D"${words[@]:1}"
 	case "${cmd}" in
 		new)
 			_network_complete_hooks "config"
 			;;
+		destroy)
+			_network_zone_subcommand_config_destroy ${zone} ${args}
+			;;
+		# We use no better globbing like [:digit:] here because hids would not mat=
ch the glob
+		# Also bash is silly here and does not unterstand things like ^[[:digit:]]=
+$ here.
+		*)
+			# Check if we get a valid id
+			# TODO: We should also accept a valid hid
+			if network raw zone-config-id-is-valid ${zone} ${cmd}; then
+				_network_zone_subcommand_config_subcommand ${zone} ${args}
+			fi
+			;;
 	esac
 }
=20
+_network_zone_subcommand_config_subcommand() {
+	local zone=3D"${1}"
+	shift
+
+	local words=3D( $@ )
+
+	local commands=3D"edit"
+
+	local cmd=3D"$(_network_find_on_cmdline "${commands}")"
+	if [[ -z "${cmd}" ]]; then
+		COMPREPLY=3D( $(compgen -W "${commands}" -- "${cur}") )
+		return 0
+	fi
+}
+
+_network_zone_subcommand_config_destroy() {
+	local zone=3D"${1}"
+	shift
+
+	local words=3D( $@ )
+
+	local commands=3D"$(network raw list-zone-config-ids ${zone})"
+
+	local cmd=3D"$(_network_find_on_cmdline "${commands}")"
+	if [[ -z "${cmd}" ]]; then
+		COMPREPLY=3D( $(compgen -W "${commands}" -- "${cur}") )
+		return 0
+	fi
+}
+
 _network_zone_subcommand_port() {
 	local zone=3D"${1}"
 	shift
--=20
2.6.3


--===============8426399320852754916==--