From ff9da01954b53e139e23ff665b446247da8d7bed Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 17 Apr 2017 23:51:30 +0200
Subject: [PATCH 1/5] Fix work with environment variables at `xvfb-run` (was
 done in #445 but was overwritten by #455)

---
 NodeChromeDebug/entry_point.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NodeChromeDebug/entry_point.sh b/NodeChromeDebug/entry_point.sh
index 5f561d1635..a78401991b 100644
--- a/NodeChromeDebug/entry_point.sh
+++ b/NodeChromeDebug/entry_point.sh
@@ -38,7 +38,7 @@ rm -f /tmp/.X*lock
 env | cut -f 1 -d "=" | sort > asroot
   sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
   sudo -E -i -u seluser \
-  $(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
+  "$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done)" \
   DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \

From 8120885b23294e381d1384c4e7a31a0ec2e12fdd Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Tue, 18 Apr 2017 00:05:14 +0200
Subject: [PATCH 2/5] Fix work with environment variables at `xvfb-run` now for
 Firefox

---
 NodeFirefoxDebug/entry_point.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NodeFirefoxDebug/entry_point.sh b/NodeFirefoxDebug/entry_point.sh
index 5f561d1635..a78401991b 100644
--- a/NodeFirefoxDebug/entry_point.sh
+++ b/NodeFirefoxDebug/entry_point.sh
@@ -38,7 +38,7 @@ rm -f /tmp/.X*lock
 env | cut -f 1 -d "=" | sort > asroot
   sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
   sudo -E -i -u seluser \
-  $(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
+  "$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done)" \
   DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \

From 134857bcdba553130553d54c91c295ebf9680c45 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Tue, 18 Apr 2017 00:18:44 +0200
Subject: [PATCH 3/5] Fix work with environment variables at `xvfb-run` now for
 Standalone Nodes

---
 StandaloneDebug/entry_point.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/StandaloneDebug/entry_point.sh b/StandaloneDebug/entry_point.sh
index 990365ab2f..91ab09d899 100644
--- a/StandaloneDebug/entry_point.sh
+++ b/StandaloneDebug/entry_point.sh
@@ -23,7 +23,7 @@ sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
 
 # Add root environment variables that are not present in the seluser
 # environment to an environment file.
-$(for E in $(grep -vxFf asseluser asroot); do echo $E="'${!E}'" >> ~seluser/selenv; done) \
+"$(for E in $(grep -vxFf asseluser asroot); do echo $E="'${!E}'" >> ~seluser/selenv; done)" \
 echo "DISPLAY=${DISPLAY}" >> ~seluser/selenv
 
 sudo -E -i -u seluser \

From fdacef25dd49a1c47ef920113337f615ea891fee Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Tue, 18 Apr 2017 00:51:17 +0200
Subject: [PATCH 4/5] Updating CI variable for tests

---
 sa-test.sh | 2 +-
 test.sh    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sa-test.sh b/sa-test.sh
index 90963ddef0..15f9cd8eb2 100755
--- a/sa-test.sh
+++ b/sa-test.sh
@@ -27,7 +27,7 @@ function test_standalone {
     exit 1
   fi
 
-  if [ ! "$CIRCLECI" ==  "true" ]; then
+  if [ ! "${IN_TRAVIS}" ==  "true" ]; then
     echo Tearing down Selenium standalone-$BROWSER$DEBUG container
     docker stop $SA_NAME
     docker rm $SA_NAME
diff --git a/test.sh b/test.sh
index b38505e847..77c9fbe113 100755
--- a/test.sh
+++ b/test.sh
@@ -59,7 +59,7 @@ function test_node {
     exit 1
   fi
 
-  if [ ! "$CIRCLECI" ==  "true" ]; then
+  if [ ! "${IN_TRAVIS}" ==  "true" ]; then
     echo Removing the test container
     docker rm $TEST_CONTAINER
   fi
@@ -72,7 +72,7 @@ if [ -z $DEBUG ]; then
   test_node phantomjs $DEBUG
 fi
 
-if [ ! "$CIRCLECI" ==  "true" ]; then
+if [ ! "${IN_TRAVIS}" ==  "true" ]; then
   echo Tearing down Selenium Chrome Node container
   docker stop $NODE_CHROME
   docker rm $NODE_CHROME

From d918f6dc6deb1d8c217124f4f0cd39330c3d953d Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Tue, 18 Apr 2017 01:00:28 +0200
Subject: [PATCH 5/5] Correcting typo in CI variable.

---
 sa-test.sh | 2 +-
 test.sh    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sa-test.sh b/sa-test.sh
index 15f9cd8eb2..655e7c6e5b 100755
--- a/sa-test.sh
+++ b/sa-test.sh
@@ -27,7 +27,7 @@ function test_standalone {
     exit 1
   fi
 
-  if [ ! "${IN_TRAVIS}" ==  "true" ]; then
+  if [ ! "${TRAVIS}" ==  "true" ]; then
     echo Tearing down Selenium standalone-$BROWSER$DEBUG container
     docker stop $SA_NAME
     docker rm $SA_NAME
diff --git a/test.sh b/test.sh
index 77c9fbe113..ebdd7e6514 100755
--- a/test.sh
+++ b/test.sh
@@ -59,7 +59,7 @@ function test_node {
     exit 1
   fi
 
-  if [ ! "${IN_TRAVIS}" ==  "true" ]; then
+  if [ ! "${TRAVIS}" ==  "true" ]; then
     echo Removing the test container
     docker rm $TEST_CONTAINER
   fi
@@ -72,7 +72,7 @@ if [ -z $DEBUG ]; then
   test_node phantomjs $DEBUG
 fi
 
-if [ ! "${IN_TRAVIS}" ==  "true" ]; then
+if [ ! "${TRAVIS}" ==  "true" ]; then
   echo Tearing down Selenium Chrome Node container
   docker stop $NODE_CHROME
   docker rm $NODE_CHROME