diff options
| author | Adam Trhon <adam.trhon@tbs-biometrics.com> | 2019-02-19 09:12:22 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:25:03 +0000 |
| commit | 84c63858be47d33e49140181d73c253886d5aec5 (patch) | |
| tree | 085df0a8602705c3750ff785d737942d33d08c62 | |
| parent | f3e2f78f282bf3a68a4923009825eb4fb460ca50 (diff) | |
| download | openembedded-core-84c63858be47d33e49140181d73c253886d5aec5.tar.gz openembedded-core-84c63858be47d33e49140181d73c253886d5aec5.tar.bz2 openembedded-core-84c63858be47d33e49140181d73c253886d5aec5.zip | |
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 <adam.trhon@tbs-biometrics.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |