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

lib/helpers: delete `_bash-it-determine-component-status-from-path()` 

Duplicate function of existing `_bash-it-component-item-is-enabled()`.
pull/1934/head
John D Pell 2022-01-04 09:26:18 -08:00 committed by John D Pell
parent 62b5297dc2
commit dfc3fa4339
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/helpers.bash
View File

@ -525,8 +525,7 @@ function _bash-it-profile-save() {
local component_exists="" f local component_exists="" f
echo "Saving $subdirectory configuration..." echo "Saving $subdirectory configuration..."
for f in "${BASH_IT}/$subdirectory/available/"*.bash; do for f in "${BASH_IT}/$subdirectory/available/"*.bash; do
_bash-it-determine-component-status-from-path "$f" if _bash-it-component-item-is-enabled "$f"; then
if [[ "$enabled" == "x" ]]; then
if [[ -z "$component_exists" ]]; then if [[ -z "$component_exists" ]]; then
# This is the first component of this type, print the header # This is the first component of this type, print the header
component_exists="yes" component_exists="yes"
@ -534,6 +533,7 @@ function _bash-it-profile-save() {
echo "" >> "$profile_path" echo "" >> "$profile_path"
echo "# $subdirectory" >> "$profile_path" echo "# $subdirectory" >> "$profile_path"
fi fi
enabled_file="$(_bash-it-get-component-name-from-path "$f")"
echo "$subdirectory $enabled_file" >> "$profile_path" echo "$subdirectory $enabled_file" >> "$profile_path"
fi fi
done done
@ -682,19 +682,6 @@ function _bash-it-reload() {
popd > /dev/null || return popd > /dev/null || return
} }
_bash-it-determine-component-status-from-path() {
_about 'internal function used to process component name and check if its enabled'
_param '1: full path to available component file'
_example '$ _bash-it-determine-component-status-from-path "${BASH_IT}/plugins/available/git.plugin.bash'
# Check for both the old format without the load priority, and the extended format with the priority
enabled_file="${f##*/}"
enabled_file="${enabled_file%."${file_type}"*.bash}"
enabled=
_bash-it-component-item-is-enabled "${file_type}" "${enabled_file}" && enabled='x'
return 0
}
function _bash-it-describe() { function _bash-it-describe() {
_about 'summarizes available bash_it components' _about 'summarizes available bash_it components'
_param '1: subdirectory' _param '1: subdirectory'
@ -709,11 +696,12 @@ function _bash-it-describe() {
file_type="$3" file_type="$3"
column_header="$4" column_header="$4"
local f
local enabled enabled_file
printf "%-20s %-10s %s\n" "$column_header" 'Enabled?' 'Description' printf "%-20s %-10s %s\n" "$column_header" 'Enabled?' 'Description'
for f in "${BASH_IT?}/$subdirectory/available"/*.*.bash; do for f in "${BASH_IT?}/$subdirectory/available"/*.*.bash; do
_bash-it-determine-component-status-from-path "$f" enabled=''
enabled_file="${f##*/}"
enabled_file="${enabled_file%."${file_type}"*.bash}"
_bash-it-component-item-is-enabled "${file_type}" "${enabled_file}" && enabled='x'
printf "%-20s %-10s %s\n" "$enabled_file" "[${enabled:- }]" "$(metafor "about-$file_type" < "$f")" printf "%-20s %-10s %s\n" "$enabled_file" "[${enabled:- }]" "$(metafor "about-$file_type" < "$f")"
done done
printf '\n%s\n' "to enable $preposition $file_type, do:" printf '\n%s\n' "to enable $preposition $file_type, do:"