From 8d0983aedd062e7f1a8f42b4fc518ebc880abf21 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Mon, 17 Dec 2018 19:11:50 -0800 Subject: [PATCH] Source Python environment in settings.sh Signed-off-by: Tim 'mithro' Ansell --- utils/environment.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/environment.sh b/utils/environment.sh index 7f773271..61f1afb2 100644 --- a/utils/environment.sh +++ b/utils/environment.sh @@ -10,6 +10,10 @@ export XRAY_DIR="$( dirname "$XRAY_UTILS_DIR" )" export XRAY_DATABASE_DIR="${XRAY_DIR}/database" export XRAY_TOOLS_DIR="${XRAY_DIR}/build/tools" +if [ -e "${XRAY_DIR}/env/bin/activate" ]; then + source "${XRAY_DIR}/env/bin/activate" +fi + # misc export XRAY_PART_YAML="${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/${XRAY_PART}.yaml" export PYTHONPATH="${XRAY_DIR}:${XRAY_DIR}/third_party/fasm:$PYTHONPATH"