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

lib/helpers: fix `_command_exists()` 

The weird subshell is weird AF. Just do a normal `if`.

Ditto `_binary_exists()`, `_completion_exists()`, and `_is_function()`!
pull/2018/head
John D Pell 2022-01-04 13:48:23 -08:00 committed by John D Pell
parent 180fb93df8
commit 9b51dc0b5f
1 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
lib/helpers.bash
View File

@ -15,49 +15,49 @@ case "$OSTYPE" in
'darwin'*) BASH_IT_SED_I_PARAMETERS=(-i "") 'darwin'*) BASH_IT_SED_I_PARAMETERS=(-i "")
esac esac
function _command_exists () function _command_exists() {
{ _about 'checks for existence of a command'
_about 'checks for existence of a command' _param '1: command to check'
_param '1: command to check' _param '2: (optional) log message to include when command not found'
_param '2: (optional) log message to include when command not found' _example '$ _command_exists ls && echo exists'
_example '$ _command_exists ls && echo exists' _group 'lib'
_group 'lib' local msg="${2:-Command '$1' does not exist}"
local msg="${2:-Command '$1' does not exist!}" if type -t "$1" > /dev/null; then
if type -t "$1" &> /dev/null return 0
then else
return 0 _log_debug "$msg"
else return 1
_log_warning "$msg" fi
return 1
fi
} }
function _binary_exists () function _binary_exists() {
{ _about 'checks for existence of a binary'
_about 'checks for existence of a binary' _param '1: binary to check'
_param '1: binary to check' _param '2: (optional) log message to include when binary not found'
_param '2: (optional) log message to include when binary not found' _example '$ _binary_exists ls && echo exists'
_example '$ _binary_exists ls && echo exists' _group 'lib'
_group 'lib' local msg="${2:-Binary '$1' does not exist}"
local msg="${2:-Binary '$1' does not exist!}" if type -P "$1" > /dev/null; then
if type -P "$1" &> /dev/null return 0
then else
return 0 _log_debug "$msg"
else return 1
_log_warning "$msg" fi
return 1
fi
} }
function _completion_exists () function _completion_exists() {
{ _about 'checks for existence of a completion'
_about 'checks for existence of a completion' _param '1: command to check'
_param '1: command to check' _param '2: (optional) log message to include when completion is found'
_param '2: (optional) log message to include when completion is found' _example '$ _completion_exists gh && echo exists'
_example '$ _completion_exists gh && echo exists' _group 'lib'
_group 'lib' local msg="${2:-Completion for '$1' already exists}"
local msg="${2:-Completion for '$1' already exists!}" if complete -p "$1" &> /dev/null; then
complete -p "$1" &> /dev/null && _log_warning "$msg" ; _log_debug "$msg"
return 0
else
return 1
fi
} }
function _bash_it_homebrew_check() function _bash_it_homebrew_check()
@ -179,12 +179,20 @@ bash-it ()
fi fi
} }
_is_function () function _is_function() {
{ _about 'sets $? to true if parameter is the name of a function'
_about 'sets $? to true if parameter is the name of a function' _param '1: name of alleged function'
_param '1: name of alleged function' _param '2: (optional) log message to include when function not found'
_group 'lib' _group 'lib'
[ -n "$(LANG=C type -t $1 2>/dev/null | grep 'function')" ] _example '$ _is_function ls && echo exists'
_group 'lib'
local msg="${2:-Function '$1' does not exist}"
if LC_ALL=C type -t "$1" | _bash-it-egrep -q 'function'; then
return 0
else
_log_debug "$msg"
return 1
fi
} }
_bash-it-aliases () _bash-it-aliases ()