From: Adam Trhon Date: Tue, 19 Feb 2019 09:12:22 +0000 (+0000) Subject: icecc-env: don't raise error when icecc not installed X-Git-Tag: 2018-10.4-thud~260 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=84c63858be47d33e49140181d73c253886d5aec5;p=openembedded-core.git icecc-env: don't raise error when icecc not installed When icecc is not installed, the `which icecc` command in icecc-env.sh returns nonzero. This happens when environment is being sourced. When the terminal has `set -e`, the whole script fails and terminal is closed. Fix this by ignoring errors from the which command. Signed-off-by: Adam Trhon Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- diff --git a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh index 94760076bf..990d2fb448 100644 --- a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh +++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh @@ -21,7 +21,7 @@ # if [ -z "$ICECC_PATH" ]; then - ICECC_PATH=$(which icecc 2> /dev/null) + ICECC_PATH=$(which icecc 2> /dev/null || true) fi if [ -n "$ICECC_PATH" ]; then