XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reloader: `shellcheck` && `shfmt` 

Rewrite globbing per `shellcheck`'s SC2013 recommendations, and standardize whitespace.
pull/2055/head
John D Pell 2021-10-12 22:02:09 -07:00 committed by John D Pell
parent 75d22d865f
commit fd7b20b8d7
2 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clean_files.txt
View File

@ -18,6 +18,7 @@
# #
docs/ docs/
hooks/ hooks/
scripts/
# root files # root files
# #

39
scripts/reloader.bash 100755 → 100644
View File

@ -1,43 +1,52 @@
#!/bin/bash # shellcheck shell=bash
#
# The core component loader.
# shellcheck disable=SC2034
BASH_IT_LOG_PREFIX="core: reloader: " BASH_IT_LOG_PREFIX="core: reloader: "
if [[ "$1" != "skip" ]] && [[ -d "$BASH_IT/enabled" ]]; then if [[ "${1:-}" != "skip" ]] && [[ -d "${BASH_IT?}/enabled" ]]; then
_bash_it_config_type="" _bash_it_config_type=""
case $1 in case $1 in
alias|completion|plugin) alias | completion | plugin)
_bash_it_config_type=$1 _bash_it_config_type=$1
_log_debug "Loading enabled $1 components..." ;; _log_debug "Loading enabled $1 components..."
''|*) ;;
_log_debug "Loading all enabled components..." ;; '' | *)
_log_debug "Loading all enabled components..."
;;
esac esac
for _bash_it_config_file in $(sort <(compgen -G "$BASH_IT/enabled/*${_bash_it_config_type}.bash")); do for _bash_it_config_file in "$BASH_IT/enabled"/*"${_bash_it_config_type}.bash"; do
if [ -e "${_bash_it_config_file}" ]; then if [[ -e "${_bash_it_config_file}" ]]; then
_bash-it-log-prefix-by-path "${_bash_it_config_file}" _bash-it-log-prefix-by-path "${_bash_it_config_file}"
_log_debug "Loading component..." _log_debug "Loading component..."
# shellcheck source=/dev/null # shellcheck source=/dev/null
source $_bash_it_config_file source "$_bash_it_config_file"
_log_debug "Loaded."
else else
echo "Unable to read ${_bash_it_config_file}" > /dev/stderr _log_error "Unable to read ${_bash_it_config_file}"
fi fi
done done
fi fi
if [[ -n "${2}" ]] && [[ -d "$BASH_IT/${2}/enabled" ]]; then if [[ -n "${2:-}" ]] && [[ -d "$BASH_IT/${2}/enabled" ]]; then
case $2 in case $2 in
aliases|completion|plugins) aliases | completion | plugins)
_log_warning "Using legacy enabling for $2, please update your bash-it version and migrate" _log_warning "Using legacy enabling for $2, please update your bash-it version and migrate"
for _bash_it_config_file in $(sort <(compgen -G "$BASH_IT/${2}/enabled/*.bash")); do for _bash_it_config_file in "$BASH_IT/${2}/enabled"/*.bash; do
if [[ -e "$_bash_it_config_file" ]]; then if [[ -e "$_bash_it_config_file" ]]; then
_bash-it-log-prefix-by-path "${_bash_it_config_file}" _bash-it-log-prefix-by-path "${_bash_it_config_file}"
_log_debug "Loading component..." _log_debug "Loading component..."
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "$_bash_it_config_file" source "$_bash_it_config_file"
_log_debug "Loaded."
else else
echo "Unable to locate ${_bash_it_config_file}" > /dev/stderr _log_error "Unable to locate ${_bash_it_config_file}"
fi fi
done ;; done
;;
esac esac
fi fi