Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1271 from albers/completion-shellcheck 

Fix shellcheck warnings
This commit is contained in:
Sebastiaan van Stijn 2018-08-04 01:36:36 +02:00 committed by GitHub
parent e8cd06c8eb e587ec293b
commit b5768bea9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/completion/bash/docker
View File

@ -288,10 +288,9 @@ __docker_complete_networks() {
COMPREPLY=( $(compgen -W "$(__docker_networks "$@")" -- "$current") ) COMPREPLY=( $(compgen -W "$(__docker_networks "$@")" -- "$current") )
} }
# shellcheck disable=SC2128,SC2178
__docker_complete_containers_in_network() { __docker_complete_containers_in_network() {
local containers=$(__docker_q network inspect -f '{{range $i, $c := .Containers}}{{$i}} {{$c.Name}} {{end}}' "$1") local containers=($(__docker_q network inspect -f '{{range $i, $c := .Containers}}{{$i}} {{$c.Name}} {{end}}' "$1"))
COMPREPLY=( $(compgen -W "$containers" -- "$cur") ) COMPREPLY=( $(compgen -W "${containers[*]}" -- "$cur") )
} }
# __docker_volumes returns a list of all volumes. Additional options to # __docker_volumes returns a list of all volumes. Additional options to
@ -347,8 +346,7 @@ __docker_plugins_bundled() {
for del in "${remove[@]}" ; do for del in "${remove[@]}" ; do
plugins=(${plugins[@]/$del/}) plugins=(${plugins[@]/$del/})
done done
# shellcheck disable=SC2145 echo "${plugins[@]}" "${add[@]}"
echo "${plugins[@]} ${add[@]}"
} }
# __docker_complete_plugins_bundled applies completion of plugins based on the current # __docker_complete_plugins_bundled applies completion of plugins based on the current
@ -1456,8 +1454,7 @@ _docker_container_cp() {
local containers=( ${COMPREPLY[@]} ) local containers=( ${COMPREPLY[@]} )
COMPREPLY=( $( compgen -W "${files[*]} ${containers[*]}" -- "$cur" ) ) COMPREPLY=( $( compgen -W "${files[*]} ${containers[*]}" -- "$cur" ) )
# shellcheck disable=SC2128 if [[ "${COMPREPLY[*]}" = *: ]]; then
if [[ "$COMPREPLY" == *: ]]; then
__docker_nospace __docker_nospace
fi fi
return return
@ -1955,8 +1952,7 @@ _docker_container_run_and_create() {
;; ;;
*) *)
COMPREPLY=( $( compgen -W 'none host private shareable container:' -- "$cur" ) ) COMPREPLY=( $( compgen -W 'none host private shareable container:' -- "$cur" ) )
# shellcheck disable=SC2128 if [ "${COMPREPLY[*]}" = "container:" ]; then
if [ "$COMPREPLY" = "container:" ]; then
__docker_nospace __docker_nospace
fi fi
;; ;;
@ -2010,8 +2006,7 @@ _docker_container_run_and_create() {
;; ;;
*) *)
COMPREPLY=( $( compgen -W 'host container:' -- "$cur" ) ) COMPREPLY=( $( compgen -W 'host container:' -- "$cur" ) )
# shellcheck disable=SC2128 if [ "${COMPREPLY[*]}" = "container:" ]; then
if [ "$COMPREPLY" = "container:" ]; then
__docker_nospace __docker_nospace
fi fi
;; ;;
@ -2074,15 +2069,14 @@ _docker_container_run_and_create() {
_docker_container_start() { _docker_container_start() {
__docker_complete_detach_keys && return __docker_complete_detach_keys && return
# shellcheck disable=SC2078
case "$prev" in case "$prev" in
--checkpoint) --checkpoint)
if [ __docker_daemon_is_experimental ] ; then if __docker_daemon_is_experimental ; then
return return
fi fi
;; ;;
--checkpoint-dir) --checkpoint-dir)
if [ __docker_daemon_is_experimental ] ; then if __docker_daemon_is_experimental ; then
_filedir -d _filedir -d
return return
fi fi