Merge pull request #316 from stigkj/handle_env_vars_with_space

Handle environment vars. with space properly

Author: ddavison

StandaloneDebug/entry_point.sh

@@ -18,10 +18,14 @@ fi
 rm -f /tmp/.X*lock
 
 SERVERNUM=$(get_server_num)
-env | cut -f 1 -d "=" | sort > asroot
-sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
+
+env | sort -k 1 -t '=' > asroot
+sudo -E -u seluser -i env | sort -k 1 -t '=' > asseluser
+
+# The .bash_aliases file will run when starting xvfb with the seluser below
+join -v 1 -j 1 -t '=' --nocheck-order asroot asseluser > /home/seluser/.bash_aliases
+
 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 \