Merge pull request #3295 from odyssey4me/RI-492

Allow unbound variables for virtualenv activation
rcbops · Sep 28, 2018 · 622c96a · 622c96a
2 parents db104a7 + c0ed349
commit 622c96a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gating/check/run_deploy.sh b/gating/check/run_deploy.sh
@@ -2,7 +2,7 @@
 
 ## Shell Opts ----------------------------------------------------------------
 
-set -euv
+set -eux
 set -o pipefail
 
 ## Vars ----------------------------------------------------------------------
@@ -78,7 +78,7 @@ cd /opt/kibana-selenium
 # Work around https://github.com/pypa/virtualenv/issues/1029
 export VIRTUAL_ENV_DISABLE_PROMPT=true
 
-set +x; source .venv/bin/activate; set -x
+set +ux; source .venv/bin/activate; set -ux
 
 export PYTHONPATH=$(pwd)
 export PATH=$PATH:./phantomjs-2.1.1-linux-x86_64/bin

diff --git a/gating/check/run_deploy_mnaio.sh b/gating/check/run_deploy_mnaio.sh
@@ -16,7 +16,7 @@
 
 ## Shell Opts ----------------------------------------------------------------
 
-set -evu
+set -eux
 
 echo "Building a Multi Node AIO (MNAIO)"
 echo "+-------------------- MNAIO ENV VARS --------------------+"