patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

zephyr-env: don't fail unnecesarily when 'set -e'

Browse source 
The way the PATH modification bit was set was failing unnecesarily
when the shell is being ran with -e (fail on error), which is leading
to unnecessary (and dangerous) workarounds in integration scripts.

So wrap it in an if sentence, so the shell doesn't bail out when the
grep fails to find the scripts_path in PATH.

Change-Id: Ia88a5f430e08ef4c186d11834f4cd840ccd29f7f
Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
This commit is contained in:
Inaky Perez-Gonzalez 2017-01-06 12:27:39 -08:00 committed by Andrew Boie
parent a1d7794647
commit 62ebe7200e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
zephyr-env.sh
View file

@ -52,8 +52,9 @@ export ZEPHYR_BASE=$( builtin cd "$( dirname "$DIR" )" && pwd ${MINGW_OPT})
scripts_path=${ZEPHYR_BASE}/scripts scripts_path=${ZEPHYR_BASE}/scripts
scripts_path=$(echo "/$scripts_path" | sed 's/\\/\//g' | sed 's/://') scripts_path=$(echo "/$scripts_path" | sed 's/\\/\//g' | sed 's/://')
echo "${PATH}" | grep -q "${scripts_path}" if ! echo "${PATH}" | grep -q "${scripts_path}"; then
[ $? != 0 ] && export PATH=${scripts_path}:${PATH} export PATH=${scripts_path}:${PATH}
fi
unset scripts_path unset scripts_path
# enable custom environment settings # enable custom environment settings