diff --git a/scripts/reloader.bash b/scripts/reloader.bash index 4bc24941..5871b7cf 100755 --- a/scripts/reloader.bash +++ b/scripts/reloader.bash @@ -1,14 +1,6 @@ #!/bin/bash BASH_IT_LOG_PREFIX="core: reloader: " -function _set-prefix-based-on-path() -{ - filename=$(_bash-it-get-component-name-from-path "$1") - extension=$(_bash-it-get-component-type-from-path "$1") - # shellcheck disable=SC2034 - BASH_IT_LOG_PREFIX="$extension: $filename: " -} - if [[ "$1" != "skip" ]] && [[ -d "$BASH_IT/enabled" ]]; then _bash_it_config_type="" @@ -22,7 +14,7 @@ if [[ "$1" != "skip" ]] && [[ -d "$BASH_IT/enabled" ]]; then 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}" + _bash-it-log-prefix-by-path "${_bash_it_config_file}" _log_debug "Loading component..." # shellcheck source=/dev/null source $_bash_it_config_file @@ -38,7 +30,7 @@ if [[ -n "${2}" ]] && [[ -d "$BASH_IT/${2}/enabled" ]]; then _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 if [[ -e "$_bash_it_config_file" ]]; then - _set-prefix-based-on-path "${_bash_it_config_file}" + _bash-it-log-prefix-by-path "${_bash_it_config_file}" _log_debug "Loading component..." # shellcheck source=/dev/null source "$_bash_it_config_file"