diff --git a/.bash_completion.d/docker_machine.bash b/.bash_completion.d/docker-machine.bash
similarity index 81%
rename from .bash_completion.d/docker_machine.bash
rename to .bash_completion.d/docker-machine.bash
index 1c9f2aba946d96104a6cfbfff685ef0d982f0804..feb08247f3c46d21108ce879e16d11aa77c6f8e1 100644
--- a/.bash_completion.d/docker_machine.bash
+++ b/.bash_completion.d/docker-machine.bash
@@ -62,7 +62,7 @@ _docker_machine_value_of_option() {
}
# Returns `key` if we are currently completing the value of a map option
-# (`key=value`) which matches the extglob passed in as an argument.
+# (`key=value`) which matches the glob passed in as an argument.
# This function is needed for key-specific argument completions.
_docker_machine_map_key_of_current_option() {
local glob="$1"
@@ -83,9 +83,43 @@ _docker_machine_map_key_of_current_option() {
[ "${words[$glob_pos]}" = "=" ] && ((glob_pos--)) # --option=key=value syntax
- [[ ${words[$glob_pos]} == @($glob) ]] && echo "$key"
+ [[ ${words[$glob_pos]} == $glob ]] && echo "$key"
}
+# Finds the position of the first word that is neither option nor an option's argument.
+# If there are options that require arguments, you need to pass a glob describing
+# those options, e.g. "--option1|-o|--option2".
+# Use this function to restrict completions to exact positions after the options.
+_docker_machine_pos_first_nonflag() {
+ local argument_flags=$1
+
+ local counter=$((${subcommand_pos:-${command_pos}} + 1))
+ while [ "$counter" -le "$cword" ]; do
+ if [ -n "$argument_flags" ] && eval "case '${words[$counter]}' in $argument_flags) true ;; *) false ;; esac"; then
+ (( counter++ ))
+ # eat "=" in case of --option=arg syntax
+ [ "${words[$counter]}" = "=" ] && (( counter++ ))
+ else
+ case "${words[$counter]}" in
+ -*)
+ ;;
+ *)
+ break
+ ;;
+ esac
+ fi
+
+ # Bash splits words at "=", retaining "=" as a word, examples:
+ # "--debug=false" => 3 words, "--log-opt syslog-facility=daemon" => 4 words
+ while [ "${words[$counter + 1]}" = "=" ] ; do
+ counter=$(( counter + 2))
+ done
+
+ (( counter++ ))
+ done
+
+ echo $counter
+}
# --- completion functions ---------------------------------------------------
_docker_machine_active() {
@@ -208,6 +242,21 @@ _docker_machine_ls() {
fi
}
+_docker_machine_mount() {
+ if [[ "${cur}" == -* ]]; then
+ COMPREPLY=($(compgen -W "--help --unmount -u" -- "${cur}"))
+ else
+ local pos=$(_docker_machine_pos_first_nonflag)
+ if [ "$cword" -eq "$pos" ]; then
+ # We can't complete remote filesystems. All we can do here is to complete the machine.
+ COMPREPLY=($(compgen -W "$(_docker_machine_machines --filter state=Running)" -S: -- "${cur}"))
+ _docker_machine_nospace
+ elif [ "$cword" -eq "$((pos + 1))" ]; then
+ _filedir -d
+ fi
+ fi
+}
+
_docker_machine_provision() {
if [[ "${cur}" == -* ]]; then
COMPREPLY=($(compgen -W "--help" -- "${cur}"))
@@ -218,7 +267,7 @@ _docker_machine_provision() {
_docker_machine_regenerate_certs() {
if [[ "${cur}" == -* ]]; then
- COMPREPLY=($(compgen -W "--force -f --help" -- "${cur}"))
+ COMPREPLY=($(compgen -W "--client-certs --force -f --help" -- "${cur}"))
else
COMPREPLY=($(compgen -W "$(_docker_machine_machines --filter state=Running)" -- "${cur}"))
fi
@@ -250,7 +299,7 @@ _docker_machine_ssh() {
_docker_machine_scp() {
if [[ "${cur}" == -* ]]; then
- COMPREPLY=($(compgen -W "--delta -d --help --recursive -r" -- "${cur}"))
+ COMPREPLY=($(compgen -W "--delta -d --help --quiet -q --recursive -r" -- "${cur}"))
else
_filedir
# It would be really nice to ssh to the machine and ls to complete
@@ -329,7 +378,7 @@ _docker_machine_docker_machine() {
_docker_machine() {
COMPREPLY=()
- local commands=(active config create env inspect ip kill ls provision regenerate-certs restart rm ssh scp start status stop upgrade url version help)
+ local commands=(active config create env inspect ip kill ls mount provision regenerate-certs restart rm ssh scp start status stop upgrade url version help)
local flags=(--debug --native-ssh --github-api-token --bugsnag-api-token --help --version)
local wants_dir=(--storage-path)
@@ -343,7 +392,7 @@ _docker_machine() {
local cur prev words cword
_get_comp_words_by_ref -n : cur prev words cword
local i
- local command=docker-machine
+ local command=docker-machine command_pos=0
for (( i=1; i < ${cword}; ++i)); do
local word=${words[i]}
@@ -352,6 +401,7 @@ _docker_machine() {
(( ++i ))
elif [[ " ${commands[*]} " =~ " ${word} " ]]; then
command=${word}
+ command_pos=$i
fi
done
diff --git a/.bash_completion.d/docker_compose.bash b/.bash_completion.d/docker_compose.bash
deleted file mode 100644
index faa537cb35d2fd9071dda5c055d7c51eeda14169..0000000000000000000000000000000000000000
--- a/.bash_completion.d/docker_compose.bash
+++ /dev/null
@@ -1,661 +0,0 @@
-#!/bin/bash
-#
-# bash completion for docker-compose
-#
-# This work is based on the completion for the docker command.
-#
-# This script provides completion of:
-# - commands and their options
-# - service names
-# - filepaths
-#
-# To enable the completions either:
-# - place this file in /etc/bash_completion.d
-# or
-# - copy this file to e.g. ~/.docker-compose-completion.sh and add the line
-# below to your .bashrc after bash completion features are loaded
-# . ~/.docker-compose-completion.sh
-
-
-__docker_compose_q() {
- docker-compose 2>/dev/null "${top_level_options[@]}" "$@"
-}
-
-# Transforms a multiline list of strings into a single line string
-# with the words separated by "|".
-__docker_compose_to_alternatives() {
- local parts=( $1 )
- local IFS='|'
- echo "${parts[*]}"
-}
-
-# Transforms a multiline list of options into an extglob pattern
-# suitable for use in case statements.
-__docker_compose_to_extglob() {
- local extglob=$( __docker_compose_to_alternatives "$1" )
- echo "@($extglob)"
-}
-
-# Determines whether the option passed as the first argument exist on
-# the commandline. The option may be a pattern, e.g. `--force|-f`.
-__docker_compose_has_option() {
- local pattern="$1"
- for (( i=2; i < $cword; ++i)); do
- if [[ ${words[$i]} =~ ^($pattern)$ ]] ; then
- return 0
- fi
- done
- return 1
-}
-
-# Returns `key` if we are currently completing the value of a map option (`key=value`)
-# which matches the extglob passed in as an argument.
-# This function is needed for key-specific completions.
-__docker_compose_map_key_of_current_option() {
- local glob="$1"
-
- local key glob_pos
- if [ "$cur" = "=" ] ; then # key= case
- key="$prev"
- glob_pos=$((cword - 2))
- elif [[ $cur == *=* ]] ; then # key=value case (OSX)
- key=${cur%=*}
- glob_pos=$((cword - 1))
- elif [ "$prev" = "=" ] ; then
- key=${words[$cword - 2]} # key=value case
- glob_pos=$((cword - 3))
- else
- return
- fi
-
- [ "${words[$glob_pos]}" = "=" ] && ((glob_pos--)) # --option=key=value syntax
-
- [[ ${words[$glob_pos]} == @($glob) ]] && echo "$key"
-}
-
-# suppress trailing whitespace
-__docker_compose_nospace() {
- # compopt is not available in ancient bash versions
- type compopt &>/dev/null && compopt -o nospace
-}
-
-# Extracts all service names from the compose file.
-___docker_compose_all_services_in_compose_file() {
- __docker_compose_q config --services
-}
-
-# All services, even those without an existing container
-__docker_compose_services_all() {
- COMPREPLY=( $(compgen -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )
-}
-
-# All services that are defined by a Dockerfile reference
-__docker_compose_services_from_build() {
- COMPREPLY=( $(compgen -W "$(__docker_compose_q ps --services --filter "source=build")" -- "$cur") )
-}
-
-# All services that are defined by an image
-__docker_compose_services_from_image() {
- COMPREPLY=( $(compgen -W "$(__docker_compose_q ps --services --filter "source=image")" -- "$cur") )
-}
-
-# The services for which at least one paused container exists
-__docker_compose_services_paused() {
- names=$(__docker_compose_q ps --services --filter "status=paused")
- COMPREPLY=( $(compgen -W "$names" -- "$cur") )
-}
-
-# The services for which at least one running container exists
-__docker_compose_services_running() {
- names=$(__docker_compose_q ps --services --filter "status=running")
- COMPREPLY=( $(compgen -W "$names" -- "$cur") )
-}
-
-# The services for which at least one stopped container exists
-__docker_compose_services_stopped() {
- names=$(__docker_compose_q ps --services --filter "status=stopped")
- COMPREPLY=( $(compgen -W "$names" -- "$cur") )
-}
-
-
-_docker_compose_build() {
- case "$prev" in
- --build-arg)
- COMPREPLY=( $( compgen -e -- "$cur" ) )
- __docker_compose_nospace
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--build-arg --force-rm --help --memory --no-cache --pull" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_from_build
- ;;
- esac
-}
-
-
-_docker_compose_bundle() {
- case "$prev" in
- --output|-o)
- _filedir
- return
- ;;
- esac
-
- COMPREPLY=( $( compgen -W "--push-images --help --output -o" -- "$cur" ) )
-}
-
-
-_docker_compose_config() {
- COMPREPLY=( $( compgen -W "--help --quiet -q --resolve-image-digests --services --volumes" -- "$cur" ) )
-}
-
-
-_docker_compose_create() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--build --force-recreate --help --no-build --no-recreate" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-
-_docker_compose_docker_compose() {
- case "$prev" in
- --tlscacert|--tlscert|--tlskey)
- _filedir
- return
- ;;
- --file|-f)
- _filedir "y?(a)ml"
- return
- ;;
- --project-directory)
- _filedir -d
- return
- ;;
- $(__docker_compose_to_extglob "$top_level_options_with_args") )
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "$top_level_boolean_options $top_level_options_with_args --help -h --no-ansi --verbose --version -v" -- "$cur" ) )
- ;;
- *)
- COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
- ;;
- esac
-}
-
-
-_docker_compose_down() {
- case "$prev" in
- --rmi)
- COMPREPLY=( $( compgen -W "all local" -- "$cur" ) )
- return
- ;;
- --timeout|-t)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help --rmi --timeout -t --volumes -v --remove-orphans" -- "$cur" ) )
- ;;
- esac
-}
-
-
-_docker_compose_events() {
- case "$prev" in
- --json)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help --json" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-
-_docker_compose_exec() {
- case "$prev" in
- --index|--user|-u)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "-d --help --index --privileged -T --user -u" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_running
- ;;
- esac
-}
-
-
-_docker_compose_help() {
- COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
-}
-
-_docker_compose_images() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help -q" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-_docker_compose_kill() {
- case "$prev" in
- -s)
- COMPREPLY=( $( compgen -W "SIGHUP SIGINT SIGKILL SIGUSR1 SIGUSR2" -- "$(echo $cur | tr '[:lower:]' '[:upper:]')" ) )
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help -s" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_running
- ;;
- esac
-}
-
-
-_docker_compose_logs() {
- case "$prev" in
- --tail)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--follow -f --help --no-color --tail --timestamps -t" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-
-_docker_compose_pause() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_running
- ;;
- esac
-}
-
-
-_docker_compose_port() {
- case "$prev" in
- --protocol)
- COMPREPLY=( $( compgen -W "tcp udp" -- "$cur" ) )
- return;
- ;;
- --index)
- return;
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help --index --protocol" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-
-_docker_compose_ps() {
- local key=$(__docker_compose_map_key_of_current_option '--filter')
- case "$key" in
- source)
- COMPREPLY=( $( compgen -W "build image" -- "${cur##*=}" ) )
- return
- ;;
- status)
- COMPREPLY=( $( compgen -W "paused restarting running stopped" -- "${cur##*=}" ) )
- return
- ;;
- esac
-
- case "$prev" in
- --filter)
- COMPREPLY=( $( compgen -W "source status" -S "=" -- "$cur" ) )
- __docker_compose_nospace
- return;
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help -q --services --filter" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-
-_docker_compose_pull() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help --ignore-pull-failures --parallel --quiet" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_from_image
- ;;
- esac
-}
-
-
-_docker_compose_push() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help --ignore-push-failures" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-
-_docker_compose_restart() {
- case "$prev" in
- --timeout|-t)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_running
- ;;
- esac
-}
-
-
-_docker_compose_rm() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--force -f --help --stop -s -v" -- "$cur" ) )
- ;;
- *)
- if __docker_compose_has_option "--stop|-s" ; then
- __docker_compose_services_all
- else
- __docker_compose_services_stopped
- fi
- ;;
- esac
-}
-
-
-_docker_compose_run() {
- case "$prev" in
- -e)
- COMPREPLY=( $( compgen -e -- "$cur" ) )
- __docker_compose_nospace
- return
- ;;
- --entrypoint|--label|-l|--name|--user|-u|--volume|-v|--workdir|-w)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "-d --entrypoint -e --help --label -l --name --no-deps --publish -p --rm --service-ports -T --user -u --volume -v --workdir -w" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-
-_docker_compose_scale() {
- case "$prev" in
- =)
- COMPREPLY=("$cur")
- return
- ;;
- --timeout|-t)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) )
- ;;
- *)
- COMPREPLY=( $(compgen -S "=" -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )
- __docker_compose_nospace
- ;;
- esac
-}
-
-
-_docker_compose_start() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_stopped
- ;;
- esac
-}
-
-
-_docker_compose_stop() {
- case "$prev" in
- --timeout|-t)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_running
- ;;
- esac
-}
-
-
-_docker_compose_top() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_running
- ;;
- esac
-}
-
-
-_docker_compose_unpause() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_paused
- ;;
- esac
-}
-
-
-_docker_compose_up() {
- case "$prev" in
- =)
- COMPREPLY=("$cur")
- return
- ;;
- --exit-code-from)
- __docker_compose_services_all
- return
- ;;
- --scale)
- COMPREPLY=( $(compgen -S "=" -W "$(___docker_compose_all_services_in_compose_file)" -- "$cur") )
- __docker_compose_nospace
- return
- ;;
- --timeout|-t)
- return
- ;;
- esac
-
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --build -d --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) )
- ;;
- *)
- __docker_compose_services_all
- ;;
- esac
-}
-
-
-_docker_compose_version() {
- case "$cur" in
- -*)
- COMPREPLY=( $( compgen -W "--short" -- "$cur" ) )
- ;;
- esac
-}
-
-
-_docker_compose() {
- local previous_extglob_setting=$(shopt -p extglob)
- shopt -s extglob
-
- local commands=(
- build
- bundle
- config
- create
- down
- events
- exec
- help
- images
- kill
- logs
- pause
- port
- ps
- pull
- push
- restart
- rm
- run
- scale
- start
- stop
- top
- unpause
- up
- version
- )
-
- # Options for the docker daemon that have to be passed to secondary calls to
- # docker-compose executed by this script.
- # Other global otions that are not relevant for secondary calls are defined in
- # `_docker_compose_docker_compose`.
- local top_level_boolean_options="
- --skip-hostname-check
- --tls
- --tlsverify
- "
- local top_level_options_with_args="
- --file -f
- --host -H
- --project-directory
- --project-name -p
- --tlscacert
- --tlscert
- --tlskey
- "
-
- COMPREPLY=()
- local cur prev words cword
- _get_comp_words_by_ref -n : cur prev words cword
-
- # search subcommand and invoke its handler.
- # special treatment of some top-level options
- local command='docker_compose'
- local top_level_options=()
- local counter=1
-
- while [ $counter -lt $cword ]; do
- case "${words[$counter]}" in
- $(__docker_compose_to_extglob "$top_level_boolean_options") )
- local opt=${words[counter]}
- top_level_options+=($opt)
- ;;
- $(__docker_compose_to_extglob "$top_level_options_with_args") )
- local opt=${words[counter]}
- local arg=${words[++counter]}
- top_level_options+=($opt $arg)
- ;;
- -*)
- ;;
- *)
- command="${words[$counter]}"
- break
- ;;
- esac
- (( counter++ ))
- done
-
- local completions_func=_docker_compose_${command//-/_}
- declare -F $completions_func >/dev/null && $completions_func
-
- eval "$previous_extglob_setting"
- return 0
-}
-
-complete -F _docker_compose docker-compose docker-compose.exe
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 606b7c09cc4b016b6fdab3da6fc78e403f8d80f4..83ad13c98f8e578a6486512da7879bf777f7abfc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,6 +14,6 @@ repos:
sha: v0.6.0
hooks:
- id: shell-lint
- exclude: &excluded_shellscripts \.bash_completion\.d/(docker_machine\.bash|fabric-completion.bash|docker_compose.bash)|\.travis/travis\.sh
+ exclude: &excluded_shellscripts \.bash_completion\.d/(docker-machine\.bash|fabric-completion.bash|docker_compose.bash)|\.travis/travis\.sh
- id: shellcheck
exclude: *excluded_shellscripts
diff --git a/Documents/bin/gen-bash-completion b/Documents/bin/gen-bash-completion
index 85ad36408b961a1508f0d396d4b09553a50c2a7e..83b18521eae51f5502e2709683fe4daa43132aa6 100755
--- a/Documents/bin/gen-bash-completion
+++ b/Documents/bin/gen-bash-completion
@@ -1,5 +1,13 @@
#!/bin/sh
set -eu
-! command -v pandoc > /dev/null || pandoc --bash-completion > "$HOME/.bash_completion.d/pandoc"
-! command -v pipenv > /dev/null || pipenv --completion > "$HOME/.bash_completion.d/pipenv"
+gen_completion () {
+ executable="$1"
+ ! command -v "$executable" > /dev/null || "$@" > "$HOME/.bash_completion.d/$executable"
+}
+
+gen_completion pandoc --bash-completion
+gen_completion pipenv --completion
+gen_completion kops completion bash
+gen_completion kubectl completion bash
+gen_completion minikube completion bash