Merge pull request #2055 from gaelicWizard/lib/reloader

lib/reloader: lint and modernize
pull/2075/head
Noah Gorny 2022-01-30 00:10:32 +02:00 committed by GitHub
commit 578c702ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 46 deletions

View File

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

91
scripts/reloader.bash 100755 → 100644
View File

@ -1,53 +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: "
_bash_it_reloader_type=""
function _set-prefix-based-on-path() if [[ "${1:-}" != "skip" ]] && [[ -d "${BASH_IT?}/enabled" ]]; then
{ case $1 in
filename=$(_bash-it-get-component-name-from-path "$1") alias | completion | plugin)
extension=$(_bash-it-get-component-type-from-path "$1") _bash_it_reloader_type=$1
# shellcheck disable=SC2034 _log_debug "Loading enabled $1 components..."
BASH_IT_LOG_PREFIX="$extension: $filename: " ;;
} '' | *)
_log_debug "Loading all enabled components..."
;;
esac
if [[ "$1" != "skip" ]] && [[ -d "$BASH_IT/enabled" ]]; then for _bash_it_reloader_file in "$BASH_IT/enabled"/*"${_bash_it_reloader_type}.bash"; do
_bash_it_config_type="" if [[ -e "${_bash_it_reloader_file}" ]]; then
_bash-it-log-prefix-by-path "${_bash_it_reloader_file}"
case $1 in _log_debug "Loading component..."
alias|completion|plugin) # shellcheck source=/dev/null
_bash_it_config_type=$1 source "$_bash_it_reloader_file"
_log_debug "Loading enabled $1 components..." ;; _log_debug "Loaded."
''|*) else
_log_debug "Loading all enabled components..." ;; _log_error "Unable to read ${_bash_it_reloader_file}"
esac fi
done
for _bash_it_config_file in $(sort <(compgen -G "$BASH_IT/enabled/*${_bash_it_config_type}.bash")); do
if [ -e "${_bash_it_config_file}" ]; then
_set-prefix-based-on-path "${_bash_it_config_file}"
_log_debug "Loading component..."
# shellcheck source=/dev/null
source $_bash_it_config_file
else
echo "Unable to read ${_bash_it_config_file}" > /dev/stderr
fi
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_reloader_file in "$BASH_IT/${2}/enabled"/*.bash; do
if [[ -e "$_bash_it_config_file" ]]; then if [[ -e "$_bash_it_reloader_file" ]]; then
_set-prefix-based-on-path "${_bash_it_config_file}" _bash-it-log-prefix-by-path "${_bash_it_reloader_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_reloader_file"
else _log_debug "Loaded."
echo "Unable to locate ${_bash_it_config_file}" > /dev/stderr else
fi _log_error "Unable to locate ${_bash_it_reloader_file}"
done ;; fi
esac done
;;
esac
fi fi
unset _bash_it_config_file unset "${!_bash_it_reloader_@}"
unset _bash_it_config_type