completions: clear and consistent log messages

completion/available/apm.completion.bash

@@ -1,4 +1,4 @@
 # shellcheck shell=bash
 about-completion "apm completion"
-# shellcheck disable=SC1090
-source "${BASH_IT}"/vendor/github.com/vigo/apm-bash-completion/apm
+# shellcheck source-path=SCRIPTDIR/../../vendor/github.com/vigo/apm-bash-completion
+source "${BASH_IT?}/vendor/github.com/vigo/apm-bash-completion/apm"

completion/available/awless.completion.bash

@@ -1,5 +1,10 @@
 # shellcheck shell=bash
-if _command_exists awless; then
-	# shellcheck disable=SC1090
-	source <(awless completion bash)
-fi
+
+# Make sure awless is installed
+_bash-it-completion-helper-necessary awless || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient awless || return
+
+# shellcheck disable=SC1090
+source <(awless completion bash)

completion/available/awscli.completion.bash

@@ -1,5 +1,9 @@
 # shellcheck shell=bash
 
-if _command_exists aws_completer; then
-	complete -C "$(command -v aws_completer)" aws
-fi
+# Make sure aws is installed
+_bash-it-completion-helper-necessary aws aws_completer || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient aws || return
+
+complete -C aws_completer aws

completion/available/cargo.completion.bash

@@ -1,6 +1,10 @@
 # shellcheck shell=bash
-# cargo (Rust package manager) completion
+about-completion "cargo (Rust package manager) completion"
 
-if _binary_exists rustup && _binary_exists cargo; then
-	eval "$(rustup completions bash cargo)"
-fi
+# Make sure cargo is installed
+_bash-it-completion-helper-necessary rustup cargo || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient cargo || return
+
+eval "$(rustup completions bash cargo)"

completion/available/conda.completion.bash

@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "conda completion"
 
 if _command_exists conda; then

completion/available/consul.completion.bash

@@ -1,7 +1,10 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "Hashicorp consul completion"
 
-if _command_exists consul; then
-	complete -C "$(command -v consul)" consul
-fi
+# Make sure consul is installed
+_bash-it-completion-helper-necessary consul || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient consul || return
+
+complete -C consul consul

completion/available/crystal.completion.bash

@@ -1,2 +1,4 @@
 # shellcheck shell=bash
-_log_warning 'Bash completion for "crystal" is now covered by "system". This completion can be disabled.'
+
+_log_warning 'Bash completion for "crystal" is now covered by "system".'
+_disable-completion "crystal"

completion/available/defaults.completion.bash

@@ -1,6 +1,7 @@
 # shellcheck shell=bash
 # shellcheck disable=SC1090
 
-if test -s "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash"; then
-	source "$_"
+if [[ -s "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash" ]]; then
+	# shellcheck source-path=SCRIPTDIR/../../vendor/github.com/gaelicWizard/bash-progcomp
+	source "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash"
 fi

completion/available/dirs.completion.bash

@@ -1,16 +1,13 @@
 # shellcheck shell=bash
-# Bash completion support for the 'dirs' plugin (commands G, R).
+about-completion "Bash completion support for the 'dirs' plugin (commands G, R)."
 
-_dirs-complete() {
-	local CURRENT_PROMPT="${COMP_WORDS[COMP_CWORD]}"
-
-	# parse all defined shortcuts from ~/.dirs
-	if [ -r "$HOME/.dirs" ]; then
-		# shellcheck disable=SC2207
-		COMPREPLY=($(compgen -W "$(grep -v '^#' ~/.dirs | sed -e 's/\(.*\)=.*/\1/')" -- "${CURRENT_PROMPT}"))
+function _dirs-complete() {
+	# parse all defined shortcuts ${BASH_IT_DIRS_BKS}
+	if [[ -s "${BASH_IT_DIRS_BKS:-/dev/null}" ]]; then
+		IFS=$'\n' read -d '' -ra COMPREPLY < <(grep -v '^#' "${BASH_IT_DIRS_BKS?}" | sed -e 's/\(.*\)=.*/\1/')
 	fi
 
 	return 0
 }
 
-complete -o default -o nospace -F _dirs-complete G R
+complete -o default -o nospace -F _dirs-complete -X '!&*' G R

completion/available/dmidecode.completion.bash

@@ -1,22 +1,25 @@
 # shellcheck shell=bash
 
-function __dmidecode_completion() {
-	# shellcheck disable=SC2155
-	local prev=$(_get_pword)
-	# shellcheck disable=SC2155
-	local curr=$(_get_cword)
+# Make sure dmidecode is installed
+_bash-it-completion-helper-necessary dmidecode || :
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient dmidecode || return
+
+function _dmidecode() {
+	local prev="${COMP_WORDS[COMP_CWORD - 1]}"
 
 	case $prev in
 		-s | --string | -t | --type)
 			OPTS=$(dmidecode "$prev" 2>&1 | grep -E '^ ' | sed 's/ *//g')
 			# shellcheck disable=SC2207
-			COMPREPLY=($(compgen -W "$OPTS" -- "$curr"))
+			COMPREPLY=("${OPTS[@]}")
 			;;
 		dmidecode)
 			# shellcheck disable=SC2207
-			COMPREPLY=($(compgen -W "-d --dev-mem -h --help -q --quiet -s --string -t --type -H --handle -u --dump{,-bin} --from-dump --no-sysfs --oem-string -V --version" -- "$curr"))
+			COMPREPLY=("-d" "--dev-mem" "-h" "--help" "-q" "--quiet" "-s" "--string" "-t" "--type" "-H" "--handle" "-u" "--dump" "-dump-bin" "--from-dump" "--no-sysfs" "--oem-string" "-V" "--version")
 			;;
 	esac
 }
 
-complete -F __dmidecode_completion dmidecode
+complete -F _dmidecode -X '!&*' dmidecode

completion/available/docker.completion.bash

@@ -1,24 +1,32 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "docker completion"
 
 # Make sure docker is installed
-_command_exists docker || return
+_bash-it-completion-helper-necessary docker || :
 
 # Don't handle completion if it's already managed
-_completion_exists docker && return
+_bash-it-completion-helper-sufficient docker || return
 
 _docker_bash_completion_paths=(
-	# MacOS
+	# MacOS App
 	'/Applications/Docker.app/Contents/Resources/etc/docker.bash-completion'
-	# Linux
+	# Command Line
 	'/usr/share/bash-completion/completions/docker'
 )
 
-for fn in "${_docker_bash_completion_paths[@]}"; do
-	if [ -r "$fn" ]; then
+# Load the first completion file found
+_docker_bash_completion_found=false
+for _comp_path in "${_docker_bash_completion_paths[@]}"; do
+	if [[ -r "$_comp_path" ]]; then
+		_docker_bash_completion_found=true
 		# shellcheck disable=SC1090
-		source "$fn"
+		source "$_comp_path"
 		break
 	fi
 done
+
+# Cleanup
+if [[ "${_docker_bash_completion_found}" == false ]]; then
+	_log_warning "no completion files found - please try enabling the 'system' completion instead."
+fi
+unset "${!_docker_bash_completion@}"

completion/available/drush.completion.bash

@@ -1,3 +1,4 @@
 # shellcheck shell=bash
 _log_warning 'Bash completion for "drush" is now deprecated, as it used code with incompatible license.
 Please disable this completion and use the instructions from "drush" developers instead.'
+_disable-completion "drush"

completion/available/export.completion.bash

@@ -1,3 +1,4 @@
 # shellcheck shell=bash
 
-complete -o nospace -S = -W "$(printenv | awk -F= "{print \$1}")" export
+_log_warning 'Bash completion for "export" is now covered by "system".'
+_disable-completion "export"

completion/available/flutter.completion.bash

@@ -1,5 +1,9 @@
 # shellcheck shell=bash
 
-if _command_exists flutter; then
-	eval "$(flutter bash-completion)"
-fi
+# Make sure flutter is installed
+_bash-it-completion-helper-necessary flutter || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient flutter || return
+
+eval "$(flutter bash-completion)"

completion/available/gcloud.completion.bash

@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "Google Cloud SDK completion"
 
 if _command_exists gcloud; then

completion/available/git.completion.bash

@@ -3,13 +3,10 @@
 # Locate and load completions for `git`.
 
 # Make sure git is installed
-_command_exists git || return
+_bash-it-completion-helper-necessary git || :
 
 # Don't handle completion if it's already managed
-if complete -p git &> /dev/null; then
-	_log_warning "completion already loaded - this usually means it is safe to stop using this completion"
-	return 0
-fi
+_bash-it-completion-helper-sufficient git || return
 
 _git_bash_completion_xcrun_git=
 if _command_exists xcrun; then

completion/available/github-cli.completion.bash

@@ -1,9 +1,10 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "GitHub CLI completion"
 
-if _binary_exists gh; then
-	# If gh already completed, stop
-	_completion_exists gh && return
-	eval "$(gh completion --shell=bash)"
-fi
+# Make sure gh is installed
+_bash-it-completion-helper-necessary gh || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient gh || return
+
+eval "$(gh completion --shell=bash)"

completion/available/helm.completion.bash

@@ -1,7 +1,10 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "helm (Kubernetes Package Manager) completion"
 
-if _command_exists helm; then
-	eval "$(helm completion bash)"
-fi
+# Make sure helm is installed
+_bash-it-completion-helper-necessary helm || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient helm || return
+
+eval "$(helm completion bash)"

completion/available/homesick.completion.bash

@@ -1,3 +1,4 @@
 # shellcheck shell=bash
 _log_warning 'Bash completion for "homesick" is now deprecated, as it used unlicensed code.
 Please disable this completion and use the instructions from "homesick" bash completion developers instead.'
+_disable-completion "homesick"

completion/available/jungle.completion.bash

@@ -1,7 +1,10 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "jungle(AWS cli tool) completion"
 
-if _command_exists jungle; then
-	eval "$(_JUNGLE_COMPLETE=source jungle)"
-fi
+# Make sure jungle is installed
+_bash-it-completion-helper-necessary jungle || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient jungle || return
+
+eval "$(_JUNGLE_COMPLETE=source jungle)"

completion/available/kind.completion.bash

@@ -1,5 +1,9 @@
 # shellcheck shell=bash
 
-if _command_exists kind; then
-	eval "$(kind completion bash)"
-fi
+# Make sure kind is installed
+_bash-it-completion-helper-necessary kind || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient kind || return
+
+eval "$(kind completion bash)"

completion/available/kontena.completion.bash

@@ -1,5 +1,10 @@
 # shellcheck shell=bash
-if _command_exists kontena; then
-	# shellcheck disable=SC1090
-	source "$(kontena whoami --bash-completion-path)"
-fi
+
+# Make sure kontena is installed
+_bash-it-completion-helper-necessary kontena || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient kontena || return
+
+# shellcheck disable=SC1090
+source "$(kontena whoami --bash-completion-path)"

completion/available/kubectl.completion.bash

@@ -1,7 +1,10 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "kubectl (Kubernetes CLI) completion"
 
-if _binary_exists kubectl; then
-	eval "$(kubectl completion bash)"
-fi
+# Make sure kubectl is installed
+_bash-it-completion-helper-necessary kubectl || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient kubectl || return
+
+eval "$(kubectl completion bash)"

completion/available/laravel.completion.bash

@@ -1,6 +1,10 @@
 # shellcheck shell=bash
 
-_command_exists laravel || return
+# Make sure laravel is installed
+_bash-it-completion-helper-necessary laravel || :
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient laravel || return
 
 function __laravel_completion() {
 	local OPTS=('-h' '--help' '-q' '--quiet' '--ansi' '--no-ansi' '-n' '--no-interaction' '-v' '-vv' '-vvv' '--verbose' 'help' 'list' 'new')

completion/available/makefile.completion.bash

@@ -3,31 +3,31 @@
 # Bash completion for Makefile
 # Loosely adapted from http://stackoverflow.com/a/38415982/1472048
 
-_makecomplete() {
+function _makecomplete() {
+	local cur="${COMP_WORDS[COMP_CWORD]}"
+	local files=() targets=() line f
 	COMPREPLY=()
 
 	# https://www.gnu.org/software/make/manual/html_node/Makefile-Names.html
-	local files=()
 	for f in 'GNUmakefile' 'makefile' 'Makefile'; do
-		[ -f "$f" ] && files+=("$f")
+		[[ -f "$f" ]] && files+=("$f")
 	done
 
-	[ "${#files[@]}" -eq 0 ] && return 0
+	[[ "${#files[@]}" -eq 0 ]] && return 0
 
 	# collect all targets
-	local targets=()
 	for f in "${files[@]}"; do
 		while IFS='' read -r line; do
 			targets+=("$line")
-		done < <(grep -E -o '^[a-zA-Z0-9_-]+:([^=]|$)' "$f" | cut -d':' -f1)
+		done < <(grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' "$f" | cut -d':' -f1)
 	done
 
-	[ "${#targets[@]}" -eq 0 ] && return 0
+	[[ "${#targets[@]}" -eq 0 ]] && return 0
 
 	# use the targets for completion
 	while IFS='' read -r line; do
 		COMPREPLY+=("$line")
-	done < <(compgen -W "$(tr ' ' '\n' <<< "${targets[@]}" | sort -u)" -- "${COMP_WORDS[COMP_CWORD]}")
+	done < <(compgen -W "$(tr ' ' '\n' <<< "${targets[@]}" | sort -u)" -- "${cur}")
 
 	return 0
 }

completion/available/minikube.completion.bash

@@ -1,6 +1,10 @@
 # shellcheck shell=bash
-# minikube (Local Kubernetes) completion
+about-completion "minikube (Local Kubernetes) completion"
 
-if _command_exists minikube; then
-	eval "$(minikube completion bash)"
-fi
+# Make sure minikube is installed
+_bash-it-completion-helper-necessary minikube || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient minikube || return
+
+eval "$(minikube completion bash)"