From c0ed349f164e4a843a8cd7a3a6edfdcabdf6660d Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Fri, 28 Sep 2018 11:31:16 +0100
Subject: [PATCH] Allow unbound variables for virtualenv activation

Enabling unbound variables appears to be required for
virtualenv activation. We also remove the verbose output
because it makes the output really difficult to read
because it shows the enture script. Instead we enable
debug output, as is done in most other scripts, because
it shows the commands run instead which is more useful.

JIRA: RI-492
---
 gating/check/run_deploy.sh       | 4 ++--
 gating/check/run_deploy_mnaio.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gating/check/run_deploy.sh b/gating/check/run_deploy.sh
index 7842ba3ca..0c1ffeb5b 100755
--- 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
index 3357c49bb..41b05dd27 100755
--- 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 --------------------+"