Skip to content

Commit

Permalink
lib/reloader: unset "${!_bash_it_reloader_@}"
Browse files Browse the repository at this point in the history
  • Loading branch information
gaelicWizard committed Jan 28, 2022
1 parent fd7b20b commit 26b402e
Showing 1 changed file with 13 additions and 15 deletions.
28 changes: 13 additions & 15 deletions scripts/reloader.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,28 @@

# shellcheck disable=SC2034
BASH_IT_LOG_PREFIX="core: reloader: "
_bash_it_reloader_type=""

if [[ "${1:-}" != "skip" ]] && [[ -d "${BASH_IT?}/enabled" ]]; then
_bash_it_config_type=""

case $1 in
alias | completion | plugin)
_bash_it_config_type=$1
_bash_it_reloader_type=$1
_log_debug "Loading enabled $1 components..."
;;
'' | *)
_log_debug "Loading all enabled components..."
;;
esac

for _bash_it_config_file in "$BASH_IT/enabled"/*"${_bash_it_config_type}.bash"; do
if [[ -e "${_bash_it_config_file}" ]]; then
_bash-it-log-prefix-by-path "${_bash_it_config_file}"
for _bash_it_reloader_file in "$BASH_IT/enabled"/*"${_bash_it_reloader_type}.bash"; do
if [[ -e "${_bash_it_reloader_file}" ]]; then
_bash-it-log-prefix-by-path "${_bash_it_reloader_file}"
_log_debug "Loading component..."
# shellcheck source=/dev/null
source "$_bash_it_config_file"
source "$_bash_it_reloader_file"
_log_debug "Loaded."
else
_log_error "Unable to read ${_bash_it_config_file}"
_log_error "Unable to read ${_bash_it_reloader_file}"
fi
done
fi
Expand All @@ -35,20 +34,19 @@ if [[ -n "${2:-}" ]] && [[ -d "$BASH_IT/${2}/enabled" ]]; then
case $2 in
aliases | completion | plugins)
_log_warning "Using legacy enabling for $2, please update your bash-it version and migrate"
for _bash_it_config_file in "$BASH_IT/${2}/enabled"/*.bash; do
if [[ -e "$_bash_it_config_file" ]]; then
_bash-it-log-prefix-by-path "${_bash_it_config_file}"
for _bash_it_reloader_file in "$BASH_IT/${2}/enabled"/*.bash; do
if [[ -e "$_bash_it_reloader_file" ]]; then
_bash-it-log-prefix-by-path "${_bash_it_reloader_file}"
_log_debug "Loading component..."
# shellcheck source=/dev/null
source "$_bash_it_config_file"
source "$_bash_it_reloader_file"
_log_debug "Loaded."
else
_log_error "Unable to locate ${_bash_it_config_file}"
_log_error "Unable to locate ${_bash_it_reloader_file}"
fi
done
;;
esac
fi

unset _bash_it_config_file
unset _bash_it_config_type
unset "${!_bash_it_reloader_@}"

0 comments on commit 26b402e

Please sign in to comment.