diff --git a/aliases/available/vim.aliases.bash b/aliases/available/vim.aliases.bash index dbbe01fa..d19057d0 100644 --- a/aliases/available/vim.aliases.bash +++ b/aliases/available/vim.aliases.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash cite 'about-alias' about-alias 'vim abbreviations' diff --git a/completion/available/cargo.completion.bash b/completion/available/cargo.completion.bash index 4911613d..d276ee72 100644 --- a/completion/available/cargo.completion.bash +++ b/completion/available/cargo.completion.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash # cargo (Rust package manager) completion if _binary_exists rustup && _binary_exists cargo; then diff --git a/completion/available/knife.completion.bash b/completion/available/knife.completion.bash index 7d9b9c2b..83b332f9 100644 --- a/completion/available/knife.completion.bash +++ b/completion/available/knife.completion.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash # Published originally as public domain code at https://github.com/wk8/knife-bash-autocomplete diff --git a/completion/available/packer.completion.bash b/completion/available/packer.completion.bash index f1b1031c..2301f0f2 100644 --- a/completion/available/packer.completion.bash +++ b/completion/available/packer.completion.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash cite "about-completion" about-completion "packer completion" diff --git a/completion/available/pipx.completion.bash b/completion/available/pipx.completion.bash index dfaa3e70..16fd844d 100644 --- a/completion/available/pipx.completion.bash +++ b/completion/available/pipx.completion.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash # pipx completion if _command_exists register-python-argcomplete && _command_exists pipx; then diff --git a/completion/available/rustup.completion.bash b/completion/available/rustup.completion.bash index da880db6..1cf8bc95 100644 --- a/completion/available/rustup.completion.bash +++ b/completion/available/rustup.completion.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash # rustup (Rust toolchain installer) completion diff --git a/completion/available/vault.completion.bash b/completion/available/vault.completion.bash index 50a54986..9520f166 100644 --- a/completion/available/vault.completion.bash +++ b/completion/available/vault.completion.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash cite "about-completion" about-completion "vault completion" diff --git a/hooks/dot-bash.sh b/hooks/dot-bash.sh index facfeb06..7a9dc8bc 100755 --- a/hooks/dot-bash.sh +++ b/hooks/dot-bash.sh @@ -2,27 +2,17 @@ exit_code=0 for file in "$@"; do - # TODO Confirm file has '.bash' extension - - # Confirm not executable + # Confirm file is not executable # if [[ -x "${file}" ]]; then echo "Bash include file \`${file}\` should not be executable" exit_code=1 fi - # Confirm expected #! header - # - LINE1="$(head -n 1 "${file}")" - if [[ "${LINE1}" != "#!/usr/bin/env echo run from bash: ." ]]; then - echo "Bash include file \`${file}\` has bad/missing #! header" - exit_code=1 - fi - # Confirm expected schellcheck header # - LINE2="$(head -n 2 "${file}" | tail -n 1)" - if [[ "${LINE2}" != "# shellcheck shell=bash disable=SC2148,SC2096" ]]; then + LINE1="$(head -n 1 "${file}")" + if [[ "${LINE1}" != "# shellcheck shell=bash" ]]; then echo "Bash include file \`${file}\` has bad/missing shellcheck header" exit_code=1 fi diff --git a/hooks/dot-sh.sh b/hooks/dot-sh.sh index 34ba8bdc..3fa63216 100755 --- a/hooks/dot-sh.sh +++ b/hooks/dot-sh.sh @@ -2,8 +2,6 @@ exit_code=0 for file in "$@"; do - # TODO Confirm file has '.sh' extension - # Confirm file is executable # if [[ ! -x "${file}" ]]; then diff --git a/plugins/available/basher.plugin.bash b/plugins/available/basher.plugin.bash index b3c00dc1..2c77cbfa 100644 --- a/plugins/available/basher.plugin.bash +++ b/plugins/available/basher.plugin.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash cite about-plugin about-plugin 'initializes basher, the shell package manager' diff --git a/themes/90210/90210.theme.bash b/themes/90210/90210.theme.bash index fe3ea87e..180764c8 100644 --- a/themes/90210/90210.theme.bash +++ b/themes/90210/90210.theme.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash SCM_THEME_PROMPT_DIRTY=" ${red}✗" SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓" SCM_THEME_PROMPT_PREFIX=" |" diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash index 155082db..dd39337e 100644 --- a/themes/powerline/powerline.base.bash +++ b/themes/powerline/powerline.base.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash # Define this here so it can be used by all of the Powerline themes THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true} diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash index 1186178b..3239b360 100644 --- a/themes/powerline/powerline.theme.bash +++ b/themes/powerline/powerline.theme.bash @@ -1,5 +1,4 @@ -#!/usr/bin/env echo run from bash: . -# shellcheck shell=bash disable=SC2148,SC2096 +# shellcheck shell=bash # shellcheck source=../../themes/powerline/powerline.base.bash . "$BASH_IT/themes/powerline/powerline.base.bash"