Trying to fix a bunch of HHVM issues

Author: msmith-techempower

frameworks/PHP/Yii2/setup_hhvm.sh

@@ -12,5 +12,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
 
-hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
+$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/codeigniter/setup_hhvm.sh

@@ -17,5 +17,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
 
-hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
+$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/hhvm/run-debug.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-hhvm --config ./deploy/config-debug.hdf -m server
+hhvm -m server --config ./deploy/config-debug.hdf
 $NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
-

frameworks/PHP/hhvm/run.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-hhvm --config ./deploy/config.hdf -m server
+hhvm -m server --config ./deploy/config.hdf
 $NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
-

frameworks/PHP/php-laravel/setup_hhvm.sh

@@ -15,5 +15,5 @@ sed -i 's|/home/vagrant/FrameworkBenchmarks/installs/nginx/|'"${IROOT}"'/nginx/|
 
 export PATH="${PHP_HOME}/bin:${PHP_HOME}/sbin:$PATH"
 
-hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
+hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
 ${NGINX_HOME}/sbin/nginx -c ${TROOT}/deploy/nginx.conf

frameworks/PHP/php-slim/setup_hhvm.sh

@@ -13,5 +13,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
 
-hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
+hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
 $NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/symfony2/setup_hhvm.sh

@@ -17,5 +17,5 @@ ${PHP_HOME}/bin/php app/console cache:clear \
 ${PHP_HOME}/bin/php app/console cache:warmup \
   --env=prod --no-debug
 
-hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
+$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

toolset/setup/linux/languages/java7.sh

@@ -16,4 +16,4 @@ sudo apt-get install -y openjdk-7-jdk
 
 # Setup environment variables
 echo "export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-`dpkg --print-architecture`" > $IROOT/java7.installed
-echo "export PATH=$JAVA_HOME/bin:$PATH" >> $IROOT/java7.installed
+echo "export PATH=$JAVA_HOME/bin:$PATH" >> $IROOT/java7.installed