Skip to content

Commit dea597e

Browse files
authored
Merge pull request #459 from diemol/master
Fix work with environment variables at `xvfb-run` (2nd time)
2 parents 69707f0 + d918f6d commit dea597e

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

NodeChromeDebug/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ rm -f /tmp/.X*lock
3838
env | cut -f 1 -d "=" | sort > asroot
3939
sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
4040
sudo -E -i -u seluser \
41-
$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
41+
"$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done)" \
4242
DISPLAY=$DISPLAY \
4343
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
4444
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \

NodeFirefoxDebug/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ rm -f /tmp/.X*lock
3838
env | cut -f 1 -d "=" | sort > asroot
3939
sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
4040
sudo -E -i -u seluser \
41-
$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done) \
41+
"$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done)" \
4242
DISPLAY=$DISPLAY \
4343
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
4444
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \

StandaloneDebug/entry_point.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
2323

2424
# Add root environment variables that are not present in the seluser
2525
# environment to an environment file.
26-
$(for E in $(grep -vxFf asseluser asroot); do echo $E="'${!E}'" >> ~seluser/selenv; done) \
26+
"$(for E in $(grep -vxFf asseluser asroot); do echo $E="'${!E}'" >> ~seluser/selenv; done)" \
2727
echo "DISPLAY=${DISPLAY}" >> ~seluser/selenv
2828

2929
sudo -E -i -u seluser \

sa-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function test_standalone {
2727
exit 1
2828
fi
2929

30-
if [ ! "$CIRCLECI" == "true" ]; then
30+
if [ ! "${TRAVIS}" == "true" ]; then
3131
echo Tearing down Selenium standalone-$BROWSER$DEBUG container
3232
docker stop $SA_NAME
3333
docker rm $SA_NAME

test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function test_node {
5959
exit 1
6060
fi
6161

62-
if [ ! "$CIRCLECI" == "true" ]; then
62+
if [ ! "${TRAVIS}" == "true" ]; then
6363
echo Removing the test container
6464
docker rm $TEST_CONTAINER
6565
fi
@@ -72,7 +72,7 @@ if [ -z $DEBUG ]; then
7272
test_node phantomjs $DEBUG
7373
fi
7474

75-
if [ ! "$CIRCLECI" == "true" ]; then
75+
if [ ! "${TRAVIS}" == "true" ]; then
7676
echo Tearing down Selenium Chrome Node container
7777
docker stop $NODE_CHROME
7878
docker rm $NODE_CHROME

0 commit comments

Comments
 (0)