Improve key specific bash subcompletions
The obscure `case "${words[$cword-2]}$prev=" in` idiom is no
longer used for key specific completions in options with map values.
The `__docker_map_key_of_current_option()` function does a much
better job.
Signed-off-by: Harald Albers <github@albersweb.de>
This commit is contained in:
Harald Albers
parent
6f9bd6c1b8
commit
7e31a96d22
1 changed files with 69 additions and 63 deletions
|
|
@ -227,7 +227,6 @@ __docker_pos_first_nonflag() {
|
|||
# If we are currently completing the value of a map option (key=value)
|
||||
# which matches the extglob given as an argument, returns key.
|
||||
# This function is needed for key-specific completions.
|
||||
# TODO use this in all "${words[$cword-2]}$prev=" occurrences
|
||||
__docker_map_key_of_current_option() {
|
||||
local glob="$1"
|
||||
|
||||
|
|
@ -452,21 +451,20 @@ __docker_complete_log_options() {
|
|||
}
|
||||
|
||||
__docker_complete_log_driver_options() {
|
||||
# "=" gets parsed to a word and assigned to either $cur or $prev depending on whether
|
||||
# it is the last character or not. So we search for "xxx=" in the the last two words.
|
||||
case "${words[$cword-2]}$prev=" in
|
||||
*gelf-address=*)
|
||||
COMPREPLY=( $( compgen -W "udp" -S "://" -- "${cur#=}" ) )
|
||||
local key=$(__docker_map_key_of_current_option '--log-opt')
|
||||
case "$key" in
|
||||
gelf-address)
|
||||
COMPREPLY=( $( compgen -W "udp" -S "://" -- "${cur##*=}" ) )
|
||||
__docker_nospace
|
||||
return
|
||||
;;
|
||||
*syslog-address=*)
|
||||
COMPREPLY=( $( compgen -W "tcp:// tcp+tls:// udp:// unix://" -- "${cur#=}" ) )
|
||||
syslog-address)
|
||||
COMPREPLY=( $( compgen -W "tcp:// tcp+tls:// udp:// unix://" -- "${cur##*=}" ) )
|
||||
__docker_nospace
|
||||
__ltrim_colon_completions "${cur}"
|
||||
return
|
||||
;;
|
||||
*syslog-facility=*)
|
||||
syslog-facility)
|
||||
COMPREPLY=( $( compgen -W "
|
||||
auth
|
||||
authpriv
|
||||
|
|
@ -488,26 +486,25 @@ __docker_complete_log_driver_options() {
|
|||
syslog
|
||||
user
|
||||
uucp
|
||||
" -- "${cur#=}" ) )
|
||||
" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
*syslog-tls-@(ca-cert|cert|key)=*)
|
||||
syslog-tls-@(ca-cert|cert|key))
|
||||
_filedir
|
||||
return
|
||||
;;
|
||||
*syslog-tls-skip-verify=*)
|
||||
COMPREPLY=( $( compgen -W "true" -- "${cur#=}" ) )
|
||||
syslog-tls-skip-verify)
|
||||
COMPREPLY=( $( compgen -W "true" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
*splunk-url=*)
|
||||
COMPREPLY=( $( compgen -W "http:// https://" -- "${cur#=}" ) )
|
||||
splunk-url)
|
||||
COMPREPLY=( $( compgen -W "http:// https://" -- "${cur##*=}" ) )
|
||||
__docker_nospace
|
||||
__ltrim_colon_completions "${cur}"
|
||||
return
|
||||
;;
|
||||
*splunk-insecureskipverify=*)
|
||||
COMPREPLY=( $( compgen -W "true false" -- "${cur#=}" ) )
|
||||
__docker_nospace
|
||||
splunk-insecureskipverify)
|
||||
COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
|
@ -789,26 +786,31 @@ _docker_daemon() {
|
|||
|
||||
__docker_complete_log_driver_options && return
|
||||
|
||||
case "${words[$cword-2]}$prev=" in
|
||||
# completions for --storage-opt
|
||||
*dm.@(blkdiscard|override_udev_sync_check|use_deferred_@(removal|deletion))=*)
|
||||
COMPREPLY=( $( compgen -W "false true" -- "${cur#=}" ) )
|
||||
return
|
||||
;;
|
||||
*dm.fs=*)
|
||||
COMPREPLY=( $( compgen -W "ext4 xfs" -- "${cur#=}" ) )
|
||||
return
|
||||
;;
|
||||
*dm.thinpooldev=*)
|
||||
_filedir
|
||||
return
|
||||
;;
|
||||
# completions for --cluster-store-opt
|
||||
*kv.*file=*)
|
||||
_filedir
|
||||
return
|
||||
;;
|
||||
esac
|
||||
key=$(__docker_map_key_of_current_option '--cluster-store-opt')
|
||||
case "$key" in
|
||||
kv.*file)
|
||||
cur=${cur##*=}
|
||||
_filedir
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
||||
local key=$(__docker_map_key_of_current_option '--storage-opt')
|
||||
case "$key" in
|
||||
dm.@(blkdiscard|override_udev_sync_check|use_deferred_@(removal|deletion)))
|
||||
COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
dm.fs)
|
||||
COMPREPLY=( $( compgen -W "ext4 xfs" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
dm.thinpooldev)
|
||||
cur=${cur##*=}
|
||||
_filedir
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$prev" in
|
||||
--authorization-plugin)
|
||||
|
|
@ -914,8 +916,8 @@ _docker_diff() {
|
|||
}
|
||||
|
||||
_docker_events() {
|
||||
local filter=$(__docker_map_key_of_current_option '-f|--filter')
|
||||
case "$filter" in
|
||||
local key=$(__docker_map_key_of_current_option '-f|--filter')
|
||||
case "$key" in
|
||||
container)
|
||||
cur="${cur##*=}"
|
||||
__docker_complete_containers_all
|
||||
|
|
@ -1051,12 +1053,13 @@ _docker_history() {
|
|||
}
|
||||
|
||||
_docker_images() {
|
||||
case "${words[$cword-2]}$prev=" in
|
||||
*dangling=*)
|
||||
COMPREPLY=( $( compgen -W "true false" -- "${cur#=}" ) )
|
||||
local key=$(__docker_map_key_of_current_option '--filter|-f')
|
||||
case "$key" in
|
||||
dangling)
|
||||
COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
*label=*)
|
||||
label)
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1329,19 +1332,20 @@ _docker_network_inspect() {
|
|||
}
|
||||
|
||||
_docker_network_ls() {
|
||||
case "${words[$cword-2]}$prev=" in
|
||||
*id=*)
|
||||
cur="${cur#=}"
|
||||
local key=$(__docker_map_key_of_current_option '--filter|-f')
|
||||
case "$key" in
|
||||
id)
|
||||
cur="${cur##*=}"
|
||||
__docker_complete_network_ids
|
||||
return
|
||||
;;
|
||||
*name=*)
|
||||
cur="${cur#=}"
|
||||
name)
|
||||
cur="${cur##*=}"
|
||||
__docker_complete_network_names
|
||||
return
|
||||
;;
|
||||
*type=*)
|
||||
COMPREPLY=( $( compgen -W "builtin custom" -- "${cur#=}" ) )
|
||||
type)
|
||||
COMPREPLY=( $( compgen -W "builtin custom" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1421,24 +1425,25 @@ _docker_port() {
|
|||
}
|
||||
|
||||
_docker_ps() {
|
||||
case "${words[$cword-2]}$prev=" in
|
||||
*ancestor=*)
|
||||
cur="${cur#=}"
|
||||
local key=$(__docker_map_key_of_current_option '--filter|-f')
|
||||
case "$key" in
|
||||
ancestor)
|
||||
cur="${cur##*=}"
|
||||
__docker_complete_images
|
||||
return
|
||||
;;
|
||||
*id=*)
|
||||
cur="${cur#=}"
|
||||
id)
|
||||
cur="${cur##*=}"
|
||||
__docker_complete_container_ids
|
||||
return
|
||||
;;
|
||||
*name=*)
|
||||
cur="${cur#=}"
|
||||
name)
|
||||
cur="${cur##*=}"
|
||||
__docker_complete_container_names
|
||||
return
|
||||
;;
|
||||
*status=*)
|
||||
COMPREPLY=( $( compgen -W "created dead exited paused restarting running" -- "${cur#=}" ) )
|
||||
status)
|
||||
COMPREPLY=( $( compgen -W "created dead exited paused restarting running" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
|
@ -2015,9 +2020,10 @@ _docker_volume_inspect() {
|
|||
}
|
||||
|
||||
_docker_volume_ls() {
|
||||
case "${words[$cword-2]}$prev=" in
|
||||
*dangling=*)
|
||||
COMPREPLY=( $( compgen -W "true false" -- "${cur#=}" ) )
|
||||
local key=$(__docker_map_key_of_current_option '--filter|-f')
|
||||
case "$key" in
|
||||
dangling)
|
||||
COMPREPLY=( $( compgen -W "true false" -- "${cur##*=}" ) )
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
Loading…
Reference in a new issue