Skip to content

Commit 1649540

Browse files
committed
Always enable experimental features in bash completion
This amends docker#2774 for bash completion. Signed-off-by: Harald Albers <[email protected]>
1 parent b07e921 commit 1649540

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

contrib/completion/bash/docker

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -602,19 +602,11 @@ __docker_append_to_completions() {
602602
# The result is cached for the duration of one invocation of bash completion.
603603
__docker_fetch_info() {
604604
if [ -z "$info_fetched" ] ; then
605-
read -r client_experimental server_experimental server_os <<< "$(__docker_q version -f '{{.Client.Experimental}} {{.Server.Experimental}} {{.Server.Os}}')"
605+
read -r server_experimental server_os <<< "$(__docker_q version -f '{{.Server.Experimental}} {{.Server.Os}}')"
606606
info_fetched=true
607607
fi
608608
}
609609

610-
# __docker_client_is_experimental tests whether the Docker cli is configured to support
611-
# experimental features. If so, the function exits with 0 (true).
612-
# Otherwise, or if the result cannot be determined, the exit value is 1 (false).
613-
__docker_client_is_experimental() {
614-
__docker_fetch_info
615-
[ "$client_experimental" = "true" ]
616-
}
617-
618610
# __docker_server_is_experimental tests whether the currently configured Docker
619611
# server runs in experimental mode. If so, the function exits with 0 (true).
620612
# Otherwise, or if the result cannot be determined, the exit value is 1 (false).
@@ -1225,7 +1217,6 @@ _docker_docker() {
12251217
*)
12261218
local counter=$( __docker_pos_first_nonflag "$(__docker_to_extglob "$global_options_with_args")" )
12271219
if [ "$cword" -eq "$counter" ]; then
1228-
__docker_client_is_experimental && commands+=(${experimental_client_commands[*]})
12291220
__docker_server_is_experimental && commands+=(${experimental_server_commands[*]})
12301221
COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) )
12311222
fi
@@ -5492,6 +5483,7 @@ _docker() {
54925483
container
54935484
context
54945485
image
5486+
manifest
54955487
network
54965488
node
54975489
plugin
@@ -5550,10 +5542,6 @@ _docker() {
55505542
wait
55515543
)
55525544

5553-
local experimental_client_commands=(
5554-
manifest
5555-
)
5556-
55575545
local experimental_server_commands=(
55585546
checkpoint
55595547
)
@@ -5581,7 +5569,7 @@ _docker() {
55815569
# variables to cache server info, populated on demand for performance reasons
55825570
local info_fetched server_experimental server_os
55835571
# variables to cache client info, populated on demand for performance reasons
5584-
local client_experimental stack_orchestrator_is_kubernetes stack_orchestrator_is_swarm
5572+
local stack_orchestrator_is_kubernetes stack_orchestrator_is_swarm
55855573

55865574
local host config context
55875575

0 commit comments

Comments
 (0)