1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always enable experimental features in bash completion

Browse Source 
This amends #2774 for bash completion.

Signed-off-by: Harald Albers <github@albersweb.de>
This commit is contained in:
Harald Albers 2020-11-10 21:11:56 +01:00
parent b07e921289
commit 1649540431
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/completion/bash/docker
View File

@ -602,19 +602,11 @@ __docker_append_to_completions() {
# The result is cached for the duration of one invocation of bash completion. # The result is cached for the duration of one invocation of bash completion.
__docker_fetch_info() { __docker_fetch_info() {
if [ -z "$info_fetched" ] ; then if [ -z "$info_fetched" ] ; then
read -r client_experimental server_experimental server_os <<< "$(__docker_q version -f '{{.Client.Experimental}} {{.Server.Experimental}} {{.Server.Os}}')" read -r server_experimental server_os <<< "$(__docker_q version -f '{{.Server.Experimental}} {{.Server.Os}}')"
info_fetched=true info_fetched=true
fi fi
} }
# __docker_client_is_experimental tests whether the Docker cli is configured to support
# experimental features. If so, the function exits with 0 (true).
# Otherwise, or if the result cannot be determined, the exit value is 1 (false).
__docker_client_is_experimental() {
__docker_fetch_info
[ "$client_experimental" = "true" ]
}
# __docker_server_is_experimental tests whether the currently configured Docker # __docker_server_is_experimental tests whether the currently configured Docker
# server runs in experimental mode. If so, the function exits with 0 (true). # server runs in experimental mode. If so, the function exits with 0 (true).
# Otherwise, or if the result cannot be determined, the exit value is 1 (false). # Otherwise, or if the result cannot be determined, the exit value is 1 (false).
@ -1225,7 +1217,6 @@ _docker_docker() {
*) *)
local counter=$( __docker_pos_first_nonflag "$(__docker_to_extglob "$global_options_with_args")" ) local counter=$( __docker_pos_first_nonflag "$(__docker_to_extglob "$global_options_with_args")" )
if [ "$cword" -eq "$counter" ]; then if [ "$cword" -eq "$counter" ]; then
__docker_client_is_experimental && commands+=(${experimental_client_commands[*]})
__docker_server_is_experimental && commands+=(${experimental_server_commands[*]}) __docker_server_is_experimental && commands+=(${experimental_server_commands[*]})
COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) ) COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) )
fi fi
@ -5492,6 +5483,7 @@ _docker() {
container container
context context
image image
manifest
network network
node node
plugin plugin
@ -5550,10 +5542,6 @@ _docker() {
wait wait
) )
local experimental_client_commands=(
manifest
)
local experimental_server_commands=( local experimental_server_commands=(
checkpoint checkpoint
) )
@ -5581,7 +5569,7 @@ _docker() {
# variables to cache server info, populated on demand for performance reasons # variables to cache server info, populated on demand for performance reasons
local info_fetched server_experimental server_os local info_fetched server_experimental server_os
# variables to cache client info, populated on demand for performance reasons # variables to cache client info, populated on demand for performance reasons
local client_experimental stack_orchestrator_is_kubernetes stack_orchestrator_is_swarm local stack_orchestrator_is_kubernetes stack_orchestrator_is_swarm
local host config context local host config context