octoleo/hosts
1
0
Fork 0
mirror of https://github.com/octoleo/hosts.git synced 2024-11-21 20:35:10 +00:00
Code Releases Activity

Improve _load_subcommands().

Browse Source
This commit is contained in:
William Melody 2020-06-07 15:04:45 -07:00
parent 0b79763874
commit 040593bd51
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hosts
View File

@ -1599,15 +1599,10 @@ _DEFINED_SUBCOMMANDS=()
# Loads all of the commands sourced in the environment. # Loads all of the commands sourced in the environment.
_load_subcommands() { _load_subcommands() {
_debug printf "_load_subcommands(): entering...\\n" _debug printf "_load_subcommands(): entering...\\n"
_debug printf "_load_subcommands() declare -F:\\n%s\\n" "$(declare -F)"
local _function_list local _function_list
_function_list=($(declare -F)) _function_list=($(declare -F))
_debug printf \
"_load_subcommands() \${_function_list[@]}: %s\\n" \
"${_function_list[@]}"
for __name in "${_function_list[@]}" for __name in "${_function_list[@]}"
do do
_debug printf \ _debug printf \
@ -1618,17 +1613,11 @@ _load_subcommands() {
local _function_name local _function_name
_function_name="$(printf "%s" "${__name}" | awk '{ print $3 }')" _function_name="$(printf "%s" "${__name}" | awk '{ print $3 }')"
_debug printf \
"_load_subcommands() \${_function_name}: %s\\n" \
"${_function_name}"
# Add the function name to the $_DEFINED_SUBCOMMANDS array unless it starts # Add the function name to the $_DEFINED_SUBCOMMANDS array unless it starts
# with an underscore or is one of the desc(), or debug() functions, # with an underscore or is desc() since these are treated as having
# since these are treated as having 'private' visibility. # 'private' visibility.
if ! { [[ "${_function_name}" =~ ^_(.*) ]] || \ if [[ ! "${_function_name}" =~ ^_(.*) ]] &&
[[ "${_function_name}" == "desc" ]] || \ [[ "${_function_name}" != "desc" ]]
[[ "${_function_name}" == "debug" ]]
}
then then
_DEFINED_SUBCOMMANDS+=("${_function_name}") _DEFINED_SUBCOMMANDS+=("${_function_name}")
fi fi