lib/helpers: simplify _command_exists() and _binary_exists()

Remove subshell and just use a regular `if`
Bash-it · Sep 19, 2021 · e73b9f0 · e73b9f0
1 parent 0d75859
commit e73b9f0
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/lib/helpers.bash b/lib/helpers.bash
@@ -23,7 +23,13 @@ function _command_exists ()
   _example '$ _command_exists ls && echo exists'
   _group 'lib'
   local msg="${2:-Command '$1' does not exist!}"
-  type "$1" &> /dev/null || (_log_warning "$msg" && return 1) ;
+  if type -t "$1" &> /dev/null
+  then
+	  return 0
+  else
+	  _log_warning "$msg"
+	  return 1
+  fi
 }
 
 function _binary_exists ()
@@ -34,7 +40,13 @@ function _binary_exists ()
   _example '$ _binary_exists ls && echo exists'
   _group 'lib'
   local msg="${2:-Binary '$1' does not exist!}"
-  type -P "$1" &> /dev/null || (_log_warning "$msg" && return 1) ;
+  if type -P "$1" &> /dev/null
+  then
+	return 0
+  else
+	_log_warning "$msg"
+	return 1
+  fi
 }
 
 function _completion_exists ()