From 26b402e254a0fbe1b4af11f6460645de1368dfec Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Fri, 28 Jan 2022 13:58:00 -0800
Subject: [PATCH] lib/reloader: unset "${!_bash_it_reloader_@}"

---
 scripts/reloader.bash | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/scripts/reloader.bash b/scripts/reloader.bash
index 9299a4e4..846bbf75 100644
--- a/scripts/reloader.bash
+++ b/scripts/reloader.bash
@@ -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_@}"