From 674ee531e604751354c8998a3aced5f0d26b2713 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 7 Jul 2007 09:58:14 +0000 Subject: Silence "which" being verbose in some distros. (eg. Mandriva's which spawns "foobar was not found in /bin:/usr/bin:...." directly on stderr) --- scripts/functions | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'scripts/functions') diff --git a/scripts/functions b/scripts/functions index 18ee9695..aedb4369 100644 --- a/scripts/functions +++ b/scripts/functions @@ -158,10 +158,18 @@ CT_TestOrAbort() { # Test the presence of a tool, or abort if not found # Usage: CT_HasOrAbort CT_HasOrAbort() { - CT_TestAndAbort "\"${1}\" not found and needed for successfull toolchain build." -z "`which \"${1}\"`" + CT_TestAndAbort "\"${1}\" not found and needed for successfull toolchain build." -z "`CT_Which \"${1}\"`" return 0 } +# Search a program: wrap "which" for those system where +# "which" verbosely says there is no match (Mdk are such +# suckers...) +# Usage: CT_Which +CT_Which() { + which "$1" 2>/dev/null || true +} + # Get current date with nanosecond precision # On those system not supporting nanosecond precision, faked with rounding down # to the highest entire second @@ -292,8 +300,8 @@ CT_DoGetFileCurl() { # Wrapper function to call one of curl or wget # Usage: CT_DoGetFile CT_DoGetFile() { - local _wget=`which wget` - local _curl=`which curl` + local _wget=`CT_Which wget` + local _curl=`CT_Which curl` case "${_wget},${_curl}" in ,) CT_DoError "Could find neither wget nor curl";; ,*) CT_DoGetFileCurl "$1" 2>&1 |CT_DoLog ALL;; -- cgit v1.2.3