From f65ccde2c13faf6d9e1c593c8c312feed9175965 Mon Sep 17 00:00:00 2001 From: Ronan Pigott Date: Tue, 6 Aug 2019 21:00:36 -0700 Subject: [PATCH 1/2] shell-completion: enable resolvectl zsh completion --- .../zsh/{_systemd-resolve => _resolvectl} | 26 +++++++++---------- shell-completion/zsh/meson.build | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) rename shell-completion/zsh/{_systemd-resolve => _resolvectl} (76%) diff --git a/shell-completion/zsh/_systemd-resolve b/shell-completion/zsh/_resolvectl similarity index 76% rename from shell-completion/zsh/_systemd-resolve rename to shell-completion/zsh/_resolvectl index 3b0ce311f2..e4c7929f44 100644 --- a/shell-completion/zsh/_systemd-resolve +++ b/shell-completion/zsh/_resolvectl @@ -1,4 +1,4 @@ -#compdef systemd-resolve -*- shell-script -*- +#compdef resolvectl systemd-resolve -*- shell-script -*- # SPDX-License-Identifier: LGPL-2.1+ # # This file is part of systemd. @@ -16,29 +16,29 @@ # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see . -(( $+functions[_systemd-resolve_protocols] )) || - _systemd-resolve_protocols() { +(( $+functions[_resolvectl_protocols] )) || + _resolvectl_protocols() { local -a _protocol _protocol=( $(_call_program protocol ${service} --legend=no --protocol help; echo help) ) _values 'protocol' "$_protocol[@]" } -(( $+functions[_systemd-resolve_types] )) || - _systemd-resolve_types() { +(( $+functions[_resolvectl_types] )) || + _resolvectl_types() { local -a _type _type=( $(_call_program type ${service} --legend=no --type help; echo help) ) _values 'type' "$_type[@]" } -(( $+functions[_systemd-resolve_classes] )) || - _systemd-resolve_classes() { +(( $+functions[_resolvectl_classes] )) || + _resolvectl_classes() { local -a _class _class=( $(_call_program class ${service} --legend=no --class help; echo help) ) _values 'class' "$_class[@]" } -(( $+functions[_systemd-resolve_none] )) || - _systemd-resolve_none() { +(( $+functions[_resolvectl_none] )) || + _resolvectl_none() { _alternative : \ 'domain:DNS address:' \ 'address:email address:' @@ -51,9 +51,9 @@ _arguments \ '-4[Resolve IPv4 addresses]' \ '-6[Resolve IPv6 addresses]' \ {-i+,--interface=}'[Look on interface]:interface:_net_interfaces' \ - {-p+,--protocol=}'[Look via protocol]:protocol:_systemd-resolve_protocols' \ - {-t+,--type=}'[Query RR with DNS type]:type:_systemd-resolve_types' \ - {-c+,--class=}'[Query RR with DNS class]:class:_systemd-resolve_classes' \ + {-p+,--protocol=}'[Look via protocol]:protocol:_resolvectl_protocols' \ + {-t+,--type=}'[Query RR with DNS type]:type:_resolvectl_types' \ + {-c+,--class=}'[Query RR with DNS class]:class:_resolvectl_classes' \ '--service[Resolve services]' \ '--service-address=no[Do not resolve address for services]' \ '--service-txt=no[Do not resolve TXT records for services]' \ @@ -63,4 +63,4 @@ _arguments \ '--search=no[Do not use search domains]' \ '--statistics[Show resolver statistics]' \ '--reset-statistics[Reset resolver statistics]' \ - '*::default: _systemd-resolve_none' + '*::default: _resolvectl_none' diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build index 792b06122f..6df9cc6ac2 100644 --- a/shell-completion/zsh/meson.build +++ b/shell-completion/zsh/meson.build @@ -33,7 +33,7 @@ if zshcompletiondir != 'no' ['_machinectl', 'ENABLE_MACHINED'], ['_networkctl', 'ENABLE_NETWORKD'], ['_systemd-inhibit', 'ENABLE_LOGIND'], - ['_systemd-resolve', 'ENABLE_RESOLVE'], + ['_resolvectl', 'ENABLE_RESOLVE'], ['_systemd-tmpfiles', 'ENABLE_TMPFILES'], ['_timedatectl', 'ENABLE_TIMEDATED'], ] From 24c55b6767607fe8b2be5347e833b4e756377815 Mon Sep 17 00:00:00 2001 From: Ronan Pigott Date: Tue, 6 Aug 2019 22:50:06 -0700 Subject: [PATCH 2/2] shell-completion: add resolvectl commands to zsh completion --- shell-completion/zsh/_resolvectl | 35 +++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/shell-completion/zsh/_resolvectl b/shell-completion/zsh/_resolvectl index e4c7929f44..7458f436a5 100644 --- a/shell-completion/zsh/_resolvectl +++ b/shell-completion/zsh/_resolvectl @@ -37,12 +37,33 @@ _values 'class' "$_class[@]" } -(( $+functions[_resolvectl_none] )) || - _resolvectl_none() { - _alternative : \ - 'domain:DNS address:' \ - 'address:email address:' - } +(( $+functions[_resolvectl_commands] )) || + _resolvectl_commands() { + local -a _resolvectl_cmds + _resolvectl_cmds=( + default-route:"Configure per-interface default-route setting" + dns:"Configure per-interface DNS configuration" + dnsovertls:"Configure per-interface dnsovertls enabled status" + dnssec:"Configure per-interface dnssec enabled status" + domain:"Configure per-interface search and route-only domains" + flush-caches:"Flushes all DNS resource record caches the service maintains locally" + llmnr:"Configure per-interface llmnr enabled status" + mdns:"Configure per-interface mdns enabled status" + nta:"Configure per-interface nta domains" + openpgp:"Retrieve openpgp keys for an email" + query:"Resolve domain names, IPv4 and IPv6 addresses" + reset-server-features:"Flushes all feature level information the resolver has learned about specific servers" + reset-statistics:"Resets the statistics counter show in statistics to zero" + revert:"Revert the per-interfce DNS configuration" + service:"Resolve DNS-SD and SRV services" + status:"Show the global and per-link DNS settings currently in effect" + tlsa:"Query tlsa public keys stored as TLSA resource records" + ) + + if (( CURRENT == 1 )); then + _describe -t commands 'resolvectl commands' _resolvectl_cmds + fi +} _arguments \ {-h,--help}'[Print a short help text and exit]' \ @@ -63,4 +84,4 @@ _arguments \ '--search=no[Do not use search domains]' \ '--statistics[Show resolver statistics]' \ '--reset-statistics[Reset resolver statistics]' \ - '*::default: _resolvectl_none' + '*::default: _resolvectl_commands'