From c166cee7a46328913758b5632c50c823b4a9bde1 Mon Sep 17 00:00:00 2001 From: Denis Kadyshev Date: Thu, 6 Apr 2017 18:09:23 +0700 Subject: [PATCH] Fix work with environment variables at `xvfb-run` This fix makes it possible to use the environment variable with whitespaces, e.g. `-e SE_OPTS='-browserTimeout 86400 -timeout 86400'` like here https://github.com/Accenture/adop-docker-compose/issues/193 --- NodeChromeDebug/entry_point.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NodeChromeDebug/entry_point.sh b/NodeChromeDebug/entry_point.sh index 5f561d1635..27fbe19e1a 100644 --- a/NodeChromeDebug/entry_point.sh +++ b/NodeChromeDebug/entry_point.sh @@ -36,9 +36,9 @@ SERVERNUM=$(get_server_num) 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) \ +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)" \ DISPLAY=$DISPLAY \ xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \ java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \