From 5fab574bfd4f750371bcec602e4026ede00bd89c Mon Sep 17 00:00:00 2001 From: John D Pell Date: Sat, 1 Jan 2022 22:19:33 -0800 Subject: [PATCH] completion/system: `shfmt` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit My apologies to future `git blame` hunters ♥ --- clean_files.txt | 1 + completion/available/system.completion.bash | 72 ++++++++++----------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/clean_files.txt b/clean_files.txt index 4ecda787..237cb95b 100644 --- a/clean_files.txt +++ b/clean_files.txt @@ -72,6 +72,7 @@ completion/available/pipenv.completion.bash completion/available/pipx.completion.bash completion/available/rustup.completion.bash completion/available/sdkman.completion.bash +completion/available/system.completion.bash completion/available/vault.completion.bash completion/available/vuejs.completion.bash completion/available/wpscan.completion.bash diff --git a/completion/available/system.completion.bash b/completion/available/system.completion.bash index aa9768ac..af7ea70d 100644 --- a/completion/available/system.completion.bash +++ b/completion/available/system.completion.bash @@ -6,57 +6,55 @@ # Load before other completions # BASH_IT_LOAD_PRIORITY: 325 -if shopt -qo nounset -then # Bash-completion is too large and complex to expect to handle unbound variables throughout the whole codebase. +# Bash-completion is too large and complex to expect to handle unbound variables throughout the whole codebase. +if shopt -qo nounset; then __bash_it_restore_nounset=true shopt -uo nounset else __bash_it_restore_nounset=false fi -if [[ -r "${BASH_COMPLETION:-}" ]] ; then - # shellcheck disable=SC1091 +if [[ -r "${BASH_COMPLETION:-}" ]]; then + # shellcheck disable=SC1090 source "${BASH_COMPLETION}" -elif [[ -r /etc/bash_completion ]] ; then - # shellcheck disable=SC1091 - source /etc/bash_completion +elif [[ -r /etc/bash_completion ]]; then + # shellcheck disable=SC1091 + source /etc/bash_completion # Some distribution makes use of a profile.d script to import completion. -elif [[ -r /etc/profile.d/bash_completion.sh ]] ; then - # shellcheck disable=SC1091 - source /etc/profile.d/bash_completion.sh +elif [[ -r /etc/profile.d/bash_completion.sh ]]; then + # shellcheck disable=SC1091 + source /etc/profile.d/bash_completion.sh -elif _bash_it_homebrew_check -then - : ${BASH_COMPLETION_COMPAT_DIR:=$BASH_IT_HOMEBREW_PREFIX/etc/bash_completion.d} +elif _bash_it_homebrew_check; then + : "${BASH_COMPLETION_COMPAT_DIR:=$BASH_IT_HOMEBREW_PREFIX/etc/bash_completion.d}" - case "${BASH_VERSION}" in - 1*|2*|3.0*|3.1*) - _log_warning "Cannot load completion due to version of shell. Are you using Bash 3.2+?" - ;; - 3.2*|4.0*|4.1*) - # Import version 1.x of bash-completion, if installed. - BASH_COMPLETION="$BASH_IT_HOMEBREW_PREFIX/opt/bash-completion@1/etc/bash_completion" - if [[ -r "$BASH_COMPLETION" ]] ; then - # shellcheck disable=SC1090 - source "$BASH_COMPLETION" - else - unset BASH_COMPLETION - fi - ;; - 4.2*|5*|*) - # homebrew/versions/bash-completion2 (required for projects.completion.bash) is installed to this path - if [[ -r "$BASH_IT_HOMEBREW_PREFIX"/etc/profile.d/bash_completion.sh ]] ; then - # shellcheck disable=SC1090 - source "$BASH_IT_HOMEBREW_PREFIX"/etc/profile.d/bash_completion.sh - fi - ;; - esac + case "${BASH_VERSION}" in + 1* | 2* | 3.0* | 3.1*) + _log_warning "Cannot load completion due to version of shell. Are you using Bash 3.2+?" + ;; + 3.2* | 4.0* | 4.1*) + # Import version 1.x of bash-completion, if installed. + BASH_COMPLETION="$BASH_IT_HOMEBREW_PREFIX/opt/bash-completion@1/etc/bash_completion" + if [[ -r "$BASH_COMPLETION" ]]; then + # shellcheck disable=SC1090 + source "$BASH_COMPLETION" + else + unset BASH_COMPLETION + fi + ;; + 4.2* | 5* | *) + # homebrew/versions/bash-completion2 (required for projects.completion.bash) is installed to this path + if [[ -r "${BASH_IT_HOMEBREW_PREFIX}/etc/profile.d/bash_completion.sh" ]]; then + # shellcheck disable=SC1091 + source "${BASH_IT_HOMEBREW_PREFIX}/etc/profile.d/bash_completion.sh" + fi + ;; + esac fi -if $__bash_it_restore_nounset -then +if [[ ${__bash_it_restore_nounset:-false} == "true" ]]; then shopt -so nounset fi unset __bash_it_restore_nounset