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

lib/reloader: unset "${!_bash_it_reloader_@}"

pull/2055/head
John D Pell 2022-01-28 13:58:00 -08:00
parent fd7b20b8d7
commit 26b402e254
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/reloader.bash
View File

@ -4,13 +4,12 @@
# 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..."
;;
'' | *)
@ -18,15 +17,15 @@ if [[ "${1:-}" != "skip" ]] && [[ -d "${BASH_IT?}/enabled" ]]; then
;;
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
@ -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_@}"