Cleaned some completion files and using _command_exists helper function

completion/available/awless.completion.bash

@@ -1 +1,4 @@
-[[ -x "$(which awless)" ]] && source <(awless completion bash)
+if _command_exists awless
+then
+    source <(awless completion bash)
+fi

completion/available/brew.completion.bash

@@ -4,24 +4,24 @@
 # BASH_IT_LOAD_PRIORITY: 375
 
 if [[ "$(uname -s)" != 'Darwin' ]] ; then
-  _log_warning "unsupported operating system - only 'Darwin' is supported"
-  return 0
+    _log_warning "unsupported operating system - only 'Darwin' is supported"
+    return 1
 fi
 
 # Make sure brew is installed
 _command_exists brew || return 0
 
 BREW_PREFIX=${BREW_PREFIX:-$(brew --prefix)}
 
-if [[ -r "$BREW_PREFIX"/etc/bash_completion.d/brew ]] ; then
-  source "$BREW_PREFIX"/etc/bash_completion.d/brew
+if [[ -r "$BREW_PREFIX"/etc/bash_completion.d/brew ]]; then
+    source "$BREW_PREFIX"/etc/bash_completion.d/brew
 
-elif [[ -r "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]] ; then
-  source "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh
+    elif [[ -r "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]] ; then
+    source "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh
 
-elif [[ -f "$BREW_PREFIX"/completions/bash/brew ]] ; then
-  # For the git-clone based installation, see here for more info:
-  # https://github.com/Bash-it/bash-it/issues/1458
-  # https://docs.brew.sh/Shell-Completion
-  source "$BREW_PREFIX"/completions/bash/brew
+    elif [[ -f "$BREW_PREFIX"/completions/bash/brew ]] ; then
+    # For the git-clone based installation, see here for more info:
+    # https://github.com/Bash-it/bash-it/issues/1458
+    # https://docs.brew.sh/Shell-Completion
+    source "$BREW_PREFIX"/completions/bash/brew
 fi

completion/available/composer.completion.bash

@@ -1,133 +1,136 @@
 #!/usr/bin/env bash
 
-_composer()
-{
-    local cur script coms opts com
-    COMPREPLY=()
-    _get_comp_words_by_ref -n : cur words
+if _command_exists composer
+then
+    function _composer()
+    {
+        local cur script coms opts com
+        COMPREPLY=()
+        _get_comp_words_by_ref -n : cur words
 
-    # for an alias, get the real script behind it
-    if [[ $(type -t ${words[0]}) == "alias" ]]; then
-        script=$(alias ${words[0]} | sed -E "s/alias ${words[0]}='(.*)'/\1/")
-    else
-        script=${words[0]}
-    fi
-
-    # lookup for command
-    for word in ${words[@]:1}; do
-        if [[ $word != -* ]]; then
-            com=$word
-            break
+        # for an alias, get the real script behind it
+        if [[ $(type -t ${words[0]}) == "alias" ]]; then
+            script=$(alias ${words[0]} | sed -E "s/alias ${words[0]}='(.*)'/\1/")
+        else
+            script=${words[0]}
         fi
-    done
 
-    # completing for an option
-    if [[ ${cur} == --* ]] ; then
-        opts="--help --quiet --verbose --version --ansi --no-ansi --no-interaction --profile --no-plugins --working-dir"
+        # lookup for command
+        for word in ${words[@]:1}; do
+            if [[ $word != -* ]]; then
+                com=$word
+                break
+            fi
+        done
+
+        # completing for an option
+        if [[ ${cur} == --* ]] ; then
+            opts="--help --quiet --verbose --version --ansi --no-ansi --no-interaction --profile --no-plugins --working-dir"
 
-        case "$com" in
-            about)
-            opts="${opts} "
-            ;;
-            archive)
-            opts="${opts} --format --dir --file"
-            ;;
-            browse)
-            opts="${opts} --homepage --show"
-            ;;
-            clear-cache)
-            opts="${opts} "
-            ;;
-            config)
-            opts="${opts} --global --editor --auth --unset --list --file --absolute"
-            ;;
-            create-project)
-            opts="${opts} --stability --prefer-source --prefer-dist --repository --repository-url --dev --no-dev --no-custom-installers --no-scripts --no-progress --no-secure-http --keep-vcs --no-install --ignore-platform-reqs"
-            ;;
-            depends)
-            opts="${opts} --recursive --tree"
-            ;;
-            diagnose)
-            opts="${opts} "
-            ;;
-            dump-autoload)
-            opts="${opts} --no-scripts --optimize --classmap-authoritative --apcu --no-dev"
-            ;;
-            exec)
-            opts="${opts} --list"
-            ;;
-            global)
-            opts="${opts} "
-            ;;
-            help)
-            opts="${opts} --xml --format --raw"
-            ;;
-            init)
-            opts="${opts} --name --description --author --type --homepage --require --require-dev --stability --license --repository"
-            ;;
-            install)
-            opts="${opts} --prefer-source --prefer-dist --dry-run --dev --no-dev --no-custom-installers --no-autoloader --no-scripts --no-progress --no-suggest --optimize-autoloader --classmap-authoritative --apcu-autoloader --ignore-platform-reqs"
-            ;;
-            licenses)
-            opts="${opts} --format --no-dev"
-            ;;
-            list)
-            opts="${opts} --xml --raw --format"
-            ;;
-            outdated)
-            opts="${opts} --outdated --all --direct --strict"
-            ;;
-            prohibits)
-            opts="${opts} --recursive --tree"
-            ;;
-            remove)
-            opts="${opts} --dev --no-progress --no-update --no-scripts --update-no-dev --update-with-dependencies --no-update-with-dependencies --ignore-platform-reqs --optimize-autoloader --classmap-authoritative --apcu-autoloader"
-            ;;
-            require)
-            opts="${opts} --dev --prefer-source --prefer-dist --no-progress --no-suggest --no-update --no-scripts --update-no-dev --update-with-dependencies --ignore-platform-reqs --prefer-stable --prefer-lowest --sort-packages --optimize-autoloader --classmap-authoritative --apcu-autoloader"
-            ;;
-            run-script)
-            opts="${opts} --timeout --dev --no-dev --list"
-            ;;
-            search)
-            opts="${opts} --only-name --type"
-            ;;
-            self-update)
-            opts="${opts} --rollback --clean-backups --no-progress --update-keys --stable --preview --snapshot"
-            ;;
-            show)
-            opts="${opts} --all --installed --platform --available --self --name-only --path --tree --latest --outdated --minor-only --direct --strict"
-            ;;
-            status)
-            opts="${opts} "
-            ;;
-            suggests)
-            opts="${opts} --by-package --by-suggestion --no-dev"
-            ;;
-            update)
-            opts="${opts} --prefer-source --prefer-dist --dry-run --dev --no-dev --lock --no-custom-installers --no-autoloader --no-scripts --no-progress --no-suggest --with-dependencies --optimize-autoloader --classmap-authoritative --apcu-autoloader --ignore-platform-reqs --prefer-stable --prefer-lowest --interactive --root-reqs"
-            ;;
-            validate)
-            opts="${opts} --no-check-all --no-check-lock --no-check-publish --with-dependencies --strict"
-            ;;
+            case "$com" in
+                about)
+                    opts="${opts} "
+                ;;
+                archive)
+                    opts="${opts} --format --dir --file"
+                ;;
+                browse)
+                    opts="${opts} --homepage --show"
+                ;;
+                clear-cache)
+                    opts="${opts} "
+                ;;
+                config)
+                    opts="${opts} --global --editor --auth --unset --list --file --absolute"
+                ;;
+                create-project)
+                    opts="${opts} --stability --prefer-source --prefer-dist --repository --repository-url --dev --no-dev --no-custom-installers --no-scripts --no-progress --no-secure-http --keep-vcs --no-install --ignore-platform-reqs"
+                ;;
+                depends)
+                    opts="${opts} --recursive --tree"
+                ;;
+                diagnose)
+                    opts="${opts} "
+                ;;
+                dump-autoload)
+                    opts="${opts} --no-scripts --optimize --classmap-authoritative --apcu --no-dev"
+                ;;
+                exec)
+                    opts="${opts} --list"
+                ;;
+                global)
+                    opts="${opts} "
+                ;;
+                help)
+                    opts="${opts} --xml --format --raw"
+                ;;
+                init)
+                    opts="${opts} --name --description --author --type --homepage --require --require-dev --stability --license --repository"
+                ;;
+                install)
+                    opts="${opts} --prefer-source --prefer-dist --dry-run --dev --no-dev --no-custom-installers --no-autoloader --no-scripts --no-progress --no-suggest --optimize-autoloader --classmap-authoritative --apcu-autoloader --ignore-platform-reqs"
+                ;;
+                licenses)
+                    opts="${opts} --format --no-dev"
+                ;;
+                list)
+                    opts="${opts} --xml --raw --format"
+                ;;
+                outdated)
+                    opts="${opts} --outdated --all --direct --strict"
+                ;;
+                prohibits)
+                    opts="${opts} --recursive --tree"
+                ;;
+                remove)
+                    opts="${opts} --dev --no-progress --no-update --no-scripts --update-no-dev --update-with-dependencies --no-update-with-dependencies --ignore-platform-reqs --optimize-autoloader --classmap-authoritative --apcu-autoloader"
+                ;;
+                require)
+                    opts="${opts} --dev --prefer-source --prefer-dist --no-progress --no-suggest --no-update --no-scripts --update-no-dev --update-with-dependencies --ignore-platform-reqs --prefer-stable --prefer-lowest --sort-packages --optimize-autoloader --classmap-authoritative --apcu-autoloader"
+                ;;
+                run-script)
+                    opts="${opts} --timeout --dev --no-dev --list"
+                ;;
+                search)
+                    opts="${opts} --only-name --type"
+                ;;
+                self-update)
+                    opts="${opts} --rollback --clean-backups --no-progress --update-keys --stable --preview --snapshot"
+                ;;
+                show)
+                    opts="${opts} --all --installed --platform --available --self --name-only --path --tree --latest --outdated --minor-only --direct --strict"
+                ;;
+                status)
+                    opts="${opts} "
+                ;;
+                suggests)
+                    opts="${opts} --by-package --by-suggestion --no-dev"
+                ;;
+                update)
+                    opts="${opts} --prefer-source --prefer-dist --dry-run --dev --no-dev --lock --no-custom-installers --no-autoloader --no-scripts --no-progress --no-suggest --with-dependencies --optimize-autoloader --classmap-authoritative --apcu-autoloader --ignore-platform-reqs --prefer-stable --prefer-lowest --interactive --root-reqs"
+                ;;
+                validate)
+                    opts="${opts} --no-check-all --no-check-lock --no-check-publish --with-dependencies --strict"
+                ;;
 
-        esac
+            esac
 
-        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-        __ltrim_colon_completions "$cur"
+            COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+            __ltrim_colon_completions "$cur"
 
-        return 0;
-    fi
+            return 0;
+        fi
 
-    # completing for a command
-    if [[ $cur == $com ]]; then
-        coms="about archive browse clear-cache config create-project depends diagnose dump-autoload exec global help init install licenses list outdated prohibits remove require run-script search self-update show status suggests update validate"
+        # completing for a command
+        if [[ $cur == $com ]]; then
+            coms="about archive browse clear-cache config create-project depends diagnose dump-autoload exec global help init install licenses list outdated prohibits remove require run-script search self-update show status suggests update validate"
 
-        COMPREPLY=($(compgen -W "${coms}" -- ${cur}))
-        __ltrim_colon_completions "$cur"
+            COMPREPLY=($(compgen -W "${coms}" -- ${cur}))
+            __ltrim_colon_completions "$cur"
 
-        return 0
-    fi
-}
+            return 0
+        fi
+    }
 
-complete -o default -F _composer composer
+    complete -o default -F _composer composer
+fi

completion/available/conda.completion.bash

@@ -1,4 +1,12 @@
 #!/usr/bin/env bash
-which register-python-argcomplete > /dev/null \
-  && eval "$(register-python-argcomplete conda)" \
-  || echo "Please install argcomplete to use conda completion"
+
+if _command_exists conda
+then
+    if _command_exists register-python-argcomplete
+    then
+        eval "$(register-python-argcomplete conda)"
+    else
+        _log_warning "Argcomplete not found. Please run 'conda install argcomplete'"
+        return 1
+    fi
+fi

completion/available/consul.completion.bash

@@ -1,10 +1,6 @@
 # bash completion support for Hashicorp consul
 
-CONSUL_BIN=$(command -v consul 2>/dev/null)
-
-if [[ -x "$CONSUL_BIN" ]]
+if _command_exists consul
 then
-  complete -C "$CONSUL_BIN" consul
+    complete -C "$(which consul)" consul
 fi
-
-unset CONSUL_BIN