67dad45b38b7f0bafcaf7679da6eb4596301843b

Message

docker: update completion (upstream 2fe62f2)

Closes #5683

Diff

This diff is truncated to protect this page.

  1diff --git a/plugins/docker/_docker b/plugins/docker/_docker
  2index 415e731f3be16bc75f143c2fdda0f2dafb9cf31b..8d00b13e6d2a22d491d2cf5e9d19e08587d8a6b2 100644
  3--- a/plugins/docker/_docker
  4+++ b/plugins/docker/_docker
  5@@ -113,27 +113,27 @@ __docker_get_containers() {
  6     return ret
  7 }
  8 
  9-__docker_stoppedcontainers() {
 10+__docker_complete_stopped_containers() {
 11     [[ $PREFIX = -* ]] && return 1
 12     __docker_get_containers stopped all "$@"
 13 }
 14 
 15-__docker_runningcontainers() {
 16+__docker_complete_running_containers() {
 17     [[ $PREFIX = -* ]] && return 1
 18     __docker_get_containers running all "$@"
 19 }
 20 
 21-__docker_containers() {
 22+__docker_complete_containers() {
 23     [[ $PREFIX = -* ]] && return 1
 24     __docker_get_containers all all "$@"
 25 }
 26 
 27-__docker_containers_ids() {
 28+__docker_complete_containers_ids() {
 29     [[ $PREFIX = -* ]] && return 1
 30     __docker_get_containers all ids "$@"
 31 }
 32 
 33-__docker_containers_names() {
 34+__docker_complete_containers_names() {
 35     [[ $PREFIX = -* ]] && return 1
 36     __docker_get_containers all names "$@"
 37 }
 38@@ -149,25 +149,27 @@ __docker_complete_info_plugins() {
 39     return ret
 40 }
 41 
 42-__docker_images() {
 43+__docker_complete_images() {
 44     [[ $PREFIX = -* ]] && return 1
 45     integer ret=1
 46     declare -a images
 47     images=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/(#b)([^ ]##) ##([^ ]##) ##([^ ]##)*/${match[3]}:${(r:15:: :::)match[2]} in ${match[1]}})
 48     _describe -t docker-images "images" images && ret=0
 49-    __docker_repositories_with_tags && ret=0
 50+    __docker_complete_repositories_with_tags && ret=0
 51     return ret
 52 }
 53 
 54-__docker_repositories() {
 55+__docker_complete_repositories() {
 56     [[ $PREFIX = -* ]] && return 1
 57+    integer ret=1
 58     declare -a repos
 59     repos=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}%% *}[2,-1]})
 60     repos=(${repos#<none>})
 61-    _describe -t docker-repos "repositories" repos
 62+    _describe -t docker-repos "repositories" repos && ret=0
 63+    return ret
 64 }
 65 
 66-__docker_repositories_with_tags() {
 67+__docker_complete_repositories_with_tags() {
 68     [[ $PREFIX = -* ]] && return 1
 69     integer ret=1
 70     declare -a repos onlyrepos matched
 71@@ -244,7 +246,7 @@ __docker_get_log_options() {
 72     return ret
 73 }
 74 
 75-__docker_log_drivers() {
 76+__docker_complete_log_drivers() {
 77     [[ $PREFIX = -*  ]] && return 1
 78     integer ret=1
 79     drivers=(awslogs etwlogs fluentd gcplogs gelf journald json-file none splunk syslog)
 80@@ -252,7 +254,7 @@ __docker_log_drivers() {
 81     return ret
 82 }
 83 
 84-__docker_log_options() {
 85+__docker_complete_log_options() {
 86     [[ $PREFIX = -* ]] && return 1
 87     integer ret=1
 88 
 89@@ -295,7 +297,7 @@ __docker_complete_pid() {
 90     if compset -P '*:'; then
 91         case "${${words[-1]%:*}#*=}" in
 92             (container)
 93-                __docker_runningcontainers && ret=0
 94+                __docker_complete_running_containers && ret=0
 95                 ;;
 96             *)
 97                 _message 'value' && ret=0
 98@@ -327,36 +329,40 @@ __docker_complete_ps_filters() {
 99     if compset -P '*='; then
100         case "${${words[-1]%=*}#*=}" in
101             (ancestor)
102-                __docker_images && ret=0
103+                __docker_complete_images && ret=0
104                 ;;