settings: Handle return code correctly "eval $(python3 script.py)" does not handle the return code correctly and would try to evaluate the complete output of the Python traceback. Temporarily save the output in a variable and check the return code. If the RC is unequal to zero, return the RC and leave the bash script. Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
diff --git a/settings/artix7.sh b/settings/artix7.sh index 67c0a95..d5f63df 100644 --- a/settings/artix7.sh +++ b/settings/artix7.sh
@@ -33,4 +33,9 @@ source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env
diff --git a/settings/artix7_200t.sh b/settings/artix7_200t.sh index b701013..4ec566b 100644 --- a/settings/artix7_200t.sh +++ b/settings/artix7_200t.sh
@@ -23,4 +23,9 @@ source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env
diff --git a/settings/artix7_50t.sh b/settings/artix7_50t.sh index b73d641..7161514 100644 --- a/settings/artix7_50t.sh +++ b/settings/artix7_50t.sh
@@ -32,4 +32,9 @@ source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env
diff --git a/settings/kintex7.sh b/settings/kintex7.sh index a44a0e4..f7c16c8 100644 --- a/settings/kintex7.sh +++ b/settings/kintex7.sh
@@ -27,4 +27,9 @@ source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env
diff --git a/settings/zynq7.sh b/settings/zynq7.sh index ddd69c7..716dd3f 100644 --- a/settings/zynq7.sh +++ b/settings/zynq7.sh
@@ -29,4 +29,9 @@ source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env
diff --git a/settings/zynq7010.sh b/settings/zynq7010.sh index 4160a1c..4a9a883 100644 --- a/settings/zynq7010.sh +++ b/settings/zynq7010.sh
@@ -29,4 +29,9 @@ source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env