From e05fa477d70a793ec6dd23358ecc8a16ad45126f Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Sat, 19 Feb 2022 16:33:46 +0900 Subject: [PATCH 1/3] bash_it: source reloader.bash without arguments for the default enabling --- bash_it.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_it.sh b/bash_it.sh index 78d19b87..a1e8cdfd 100755 --- a/bash_it.sh +++ b/bash_it.sh @@ -38,7 +38,7 @@ done # "_bash_it_main_file_type" param is empty so that files get sourced in glob order for _bash_it_main_file_type in "" "aliases" "plugins" "completion"; do BASH_IT_LOG_PREFIX="core: reloader: " - source "${BASH_IT}/scripts/reloader.bash" "${_bash_it_main_file_type:+skip}" "$_bash_it_main_file_type" + source "${BASH_IT}/scripts/reloader.bash" ${_bash_it_main_file_type:+"skip" "$_bash_it_main_file_type"} BASH_IT_LOG_PREFIX="core: main: " done From 41cf3cfaf2a9e3a87af0605a0c78fe4fce1d74a3 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Sat, 19 Feb 2022 15:34:57 +0900 Subject: [PATCH 2/3] plugin/blesh: override possible arguments inherited by callers --- plugins/available/blesh.plugin.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/available/blesh.plugin.bash b/plugins/available/blesh.plugin.bash index 7b1ce74e..6acd19ff 100644 --- a/plugins/available/blesh.plugin.bash +++ b/plugins/available/blesh.plugin.bash @@ -10,7 +10,7 @@ fi _bash_it_ble_path=${XDG_DATA_HOME:-$HOME/.local/share}/blesh/ble.sh if [[ -f $_bash_it_ble_path ]]; then # shellcheck disable=1090 - source "$_bash_it_ble_path" + source "$_bash_it_ble_path" --attach=prompt else _log_error "Could not find ble.sh in $_bash_it_ble_path" _log_error "Please install using the following command:" From ee853670a11906029ba5df1ef9402cdbb65f6370 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Sat, 19 Feb 2022 17:16:53 +0900 Subject: [PATCH 3/3] bash_it: suppress a false error by shellcheck --- bash_it.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bash_it.sh b/bash_it.sh index a1e8cdfd..00a1bcea 100755 --- a/bash_it.sh +++ b/bash_it.sh @@ -38,6 +38,7 @@ done # "_bash_it_main_file_type" param is empty so that files get sourced in glob order for _bash_it_main_file_type in "" "aliases" "plugins" "completion"; do BASH_IT_LOG_PREFIX="core: reloader: " + # shellcheck disable=SC2140 source "${BASH_IT}/scripts/reloader.bash" ${_bash_it_main_file_type:+"skip" "$_bash_it_main_file_type"} BASH_IT_LOG_PREFIX="core: main: " done