Almost done...

frameworks/PHP/Yii2/install.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/Yii2/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' app/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-yii2|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/cakephp/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/cakephp/setup.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+fw_depends php composer nginx
+
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 sed -i "s|'host' => '.*'|'host' => '${DBHOST}'|g" app/Config/database.php
 sed -i 's|REDISSERVER|'${DBHOST}'|g' app/Config/core.php
 sed -i 's|".*/FrameworkBenchmarks/cakephp|"'${TROOT}'|g' deploy/cake
@@ -12,4 +11,4 @@ sed -i 's|Directory .*/FrameworkBenchmarks/cakephp|Directory '${TROOT}'|g' deplo
 sed -i 's|root .*/FrameworkBenchmarks/cakephp|root '${TROOT}'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'${IROOT}'/nginx/|g' deploy/nginx.conf
 
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/codeigniter/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/codeigniter/setup.sh

@@ -1,17 +1,10 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.5.17
-
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-
-export NGINX_HOME=${IROOT}/nginx
-
+fw_depends php nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/php-codeigniter|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/fuel/install.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/fuel/setup.sh

@@ -1,14 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
 
+fw_depends php nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' fuel/app/config/production/db.php
 sed -i 's|root .*/FrameworkBenchmarks/php-fuel|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/hhvm/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends nginx php hhvm

frameworks/PHP/hhvm/run-debug.sh

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

frameworks/PHP/hhvm/run.sh

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

frameworks/PHP/hhvm/setup.py

@@ -1,34 +0,0 @@
-
-import subprocess
-import setup_util
-import os
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("hhvm/once.php.inc", "host=localhost;", "host=" + args.database_host + ";")
-  setup_util.replace_text("hhvm/deploy/config.hdf", "SourceRoot = .*\/FrameworkBenchmarks/hhvm", "SourceRoot = " + args.troot)
-  setup_util.replace_text("hhvm/deploy/config.hdf", "Path = .*\/.hhvm.hhbc", "Path = " + args.troot + "/.hhvm.bbhc")
-  setup_util.replace_text("hhvm/deploy/config.hdf", "PidFile = .*\/hhvm.pid", "PidFile = " + args.troot + "/hhvm.pid")
-  setup_util.replace_text("hhvm/deploy/config.hdf", "File = .*\/error.log", "File = " + args.troot + "/error.log")
-
-  try:
-    if os.name == 'nt':
-      # Not supported !
-      return 0
-    subprocess.check_call("hhvm --config $TROOT/deploy/config.hdf -m daemon", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
-def stop(logfile, errfile):
-  try:
-    if os.name == 'nt':
-      # Not Supported !
-      return 0
-    p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
-    out, err = p.communicate()
-    for line in out.splitlines():
-      if 'hhvm' in line and 'toolset' not in line and 'run-ci' not in line and 'run-tests' not in line:
-        pid = int(line.split(None,2)[1])
-        os.kill(pid,15)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1

frameworks/PHP/hhvm/setup.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Setup script
-cat ../config/create.sql | mysql -u root
-
-# for testing create a symlink
-WDIR=$(cd .. && pwd)
-cd /tmp/ && ln -s $WDIR FrameworkBenchmarks && cd -
-
-# next invoke ./run.sh

frameworks/PHP/hhvm/setup_hhvm.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-export NGINX_HOME=${IROOT}/nginx
+fw_depends nginx php hhvm
 
 sed -i 's|host=localhost;|host='"${DBHOST}"';|g' once.php.inc
 sed -i 's|SourceRoot = .*/FrameworkBenchmarks/hhvm|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf
@@ -14,4 +11,4 @@ sed -i "s|/usr/local/nginx/|${IROOT}/nginx/|g" deploy/nginx.conf
 sed -i "s|TEST_ROOT|${TROOT}|g" deploy/nginx.conf
 
 hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/hhvm/test.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-for u in `cat URLs`; do echo "working on : $u"; perl -le print = x 50; echo; curl $u; echo; echo; done

frameworks/PHP/kohana/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 
-

frameworks/PHP/kohana/setup.sh

@@ -1,14 +1,10 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
+fw_depends php nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/php-kohana|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/limonade/install.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/limonade/setup.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root .*/FrameworkBenchmarks/limonade|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/lithium/install.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 
-

frameworks/PHP/lithium/setup.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+fw_depends php nginx composer
 
 sed -i 's|192.168.100.102|'"${DBHOST}"'|g' app/config/bootstrap/connections.php
 sed -i 's|root .*/FrameworkBenchmarks/php-lithium|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-fatfree/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends php nginx

frameworks/PHP/php-fatfree/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+fw_depends php nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|.*/FrameworkBenchmarks/php-fatfree|'"${TROOT}"'|g' deploy/php
@@ -10,7 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-fatfree|Directory '"${TROOT}"'|g'
 sed -i 's|root .*/FrameworkBenchmarks/php-fatfree|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-laravel/install.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir ${TROOT} \
-  --no-progress --optimize-autoloader 
-  

frameworks/PHP/php-laravel/setup.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+fw_depends php nginx composer
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' app/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/frameworks/PHP/php-laravel|root '"${TROOT}"'|g' deploy/nginx.conf 
 sed -i 's|/home/vagrant/FrameworkBenchmarks/installs/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="${PHP_HOME}/bin:${PHP_HOME}/sbin:$PATH"
-
-$PHP_FPM --fpm-config ${FWROOT}/config/php-fpm.conf -g ${TROOT}/deploy/php-fpm.pid
-${NGINX_HOME}/sbin/nginx -c ${TROOT}/deploy/nginx.conf
+php-fpm --fpm-config ${FWROOT}/config/php-fpm.conf -g ${TROOT}/deploy/php-fpm.pid
+nginx -c ${TROOT}/deploy/nginx.conf

frameworks/PHP/php-micromvc/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends php nginx

frameworks/PHP/php-micromvc/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' Config/Config.php
 sed -i 's|root .*/FrameworkBenchmarks/php-micromvc|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-phalcon-micro/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends php cphalcon nginx

frameworks/PHP/php-phalcon-micro/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' public/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-phalcon-micro|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-phalcon/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php cphalcon nginx
+fw_depends php nginx
 
 sed -i 's|mongodb://localhost|mongodb://'"${DBHOST}"'|g' app/config/config.php
 sed -i 's|localhost|'"${DBHOST}"'|g' app/config/config.php

frameworks/PHP/php-phpixie/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/php-phpixie/setup.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+fw_depends php nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' assets/config/db.php
 sed -i 's|".*/FrameworkBenchmarks/php-phpixie|"'"${TROOT}"'|g' deploy/php-phpixie
@@ -11,7 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-phpixie|Directory '"${TROOT}"'|g'
 sed -i 's|root .*/FrameworkBenchmarks/php-phpixie|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-pimf/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/php-pimf/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export COMPOSER_HOME=${IROOT}/php-composer
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' app/config.app.php
 sed -i 's|".*/FrameworkBenchmarks/php-pimf|"'"${TROOT}"'|g' deploy/php-pimf
@@ -11,7 +9,5 @@ sed -i 's|root .*/FrameworkBenchmarks/php-pimf|root '"${TROOT}"'|g' deploy/php-p
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 sed -i 's|root .*/FrameworkBenchmarks/php-pimf|root '"${TROOT}"'|g' deploy/nginx.conf
 
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-pimf/setup_raw.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export COMPOSER_HOME=${IROOT}/php-composer
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' app/config.app.php
 sed -i 's|".*/FrameworkBenchmarks/php-pimf|"'"${TROOT}"'|g' deploy/php-pimf
@@ -11,7 +9,5 @@ sed -i 's|root .*/FrameworkBenchmarks/php-pimf|root '"${TROOT}"'|g' deploy/php-p
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx_raw.conf
 sed -i 's|root .*/FrameworkBenchmarks/php-pimf|root '"${TROOT}"'|g' deploy/nginx_raw.conf
 
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx_raw.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx_raw.conf

frameworks/PHP/php-silex-orm/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/php-silex-orm/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|192.168.100.102|'"${DBHOST}"'|g' web/index.php
 sed -i 's|".*/FrameworkBenchmarks/php-silex-orm|"'"${TROOT}"'|g' deploy/php-silex-orm
@@ -10,7 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-silex-orm|Directory '"${TROOT}"'|
 sed -i 's|root .*/FrameworkBenchmarks/php-silex-orm|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-silex/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/php-silex/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export COMPOSER_HOME=${IROOT}/php-composer
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' web/index.php
 sed -i 's|".*\FrameworkBenchmarks/php-silex|"'"${TROOT}"'|g' deploy/php-silex
@@ -10,9 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-silex|Directory '"${TROOT}"'|g' d
 sed -i 's|root .*/FrameworkBenchmarks/php-silex|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-PHP_HOME=${IROOT}/php-5.5.17
-
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-silex/setup_raw.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export COMPOSER_HOME=${IROOT}/php-composer
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' web/index_raw.php
 sed -i 's|".*\FrameworkBenchmarks/php-silex|"'"${TROOT}"'|g' deploy/php-silex
@@ -10,9 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-silex|Directory '"${TROOT}"'|g' d
 sed -i 's|root .*/FrameworkBenchmarks/php-silex|root '"${TROOT}"'|g' deploy/nginx_raw.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx_raw.conf
 
-PHP_HOME=${IROOT}/php-5.5.17
-
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx_raw.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx_raw.conf

frameworks/PHP/php-slim/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends php nginx

frameworks/PHP/php-slim/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-slim| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-yaf/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends php nginx

frameworks/PHP/php-yaf/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx
 
 sed -i 's|host=localhost|host='"${DBHOST}"'|g' app/conf/application.ini
 sed -i 's|root .*/FrameworkBenchmarks/php-yaf|root '"${TROOT}"'|g' deploy/nginx.conf 
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php-zend-framework/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/php-zend-framework/setup.sh

@@ -1,14 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|host=localhost|host='"${DBHOST}"'|g' config/autoload/benchmarks.local.php
 sed -i 's|root .*/FrameworkBenchmarks/php-zend-framework|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf 
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf 

frameworks/PHP/php-zend-framework1/install.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 
-

frameworks/PHP/php-zend-framework1/setup.sh

@@ -1,14 +1,10 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|host = "localhost"|host = "'"${DBHOST}"'"|g' application/configs/application.ini
 sed -i 's|root .*/FrameworkBenchmarks/php-zend-framework1|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php/install.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/php/setup.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+fw_depends php nginx composer
+
 sed -i "s|localhost|${DBHOST}|g" dborm.php
 sed -i "s|localhost|${DBHOST}|g" dbraw.php
 sed -i "s|localhost|${DBHOST}|g" updateraw.php
@@ -10,9 +12,5 @@ sed -i "s|TEST_ROOT|${TROOT}|g" deploy/nginx.conf
 
 sed -i "s|/usr/local/nginx/|${IROOT}/nginx/|g" deploy/nginx.conf
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/phreeze/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/phreeze/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|localhost:3306|'"${DBHOST}"':3306|g' index.php
 sed -i 's|.*/FrameworkBenchmarks/phreeze|"'"${TROOT}"'|g' deploy/phreeze
@@ -10,7 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/phreeze|Directory '"${TROOT}"'|g' dep
 sed -i 's|root .*/FrameworkBenchmarks/phreeze|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
-
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/symfony2-stripped/install.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php composer nginx
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/symfony2-stripped/setup.sh

@@ -1,16 +1,13 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php composer nginx
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
 sed -i 's|root .*/FrameworkBenchmarks/php-symfony2-stripped| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-${PHP_HOME}/bin/php app/console cache:clear \
-  --env=prod --no-debug --no-warmup
-${PHP_HOME}/bin/php app/console cache:warmup \
-  --env=prod --no-debug
+php app/console cache:clear --env=prod --no-debug --no-warmup
+php app/console cache:warmup --env=prod --no-debug
 
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/symfony2/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
-fw_depends php nginx composer
-
-${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
-  --no-interaction --working-dir $TROOT \
-  --no-progress --optimize-autoloader 

frameworks/PHP/symfony2/setup.sh

@@ -1,17 +1,13 @@
 #!/bin/bash
-export PHP_HOME=${IROOT}/php-5.5.17
-export COMPOSER_HOME=${IROOT}/php-composer
-export PHP_FPM=${PHP_HOME}/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
 sed -i 's|root .*/FrameworkBenchmarks/php-symfony2| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-${PHP_HOME}/bin/php app/console cache:clear \
-  --env=prod --no-debug --no-warmup
-${PHP_HOME}/bin/php app/console cache:warmup \
-  --env=prod --no-debug
+php app/console cache:clear --env=prod --no-debug --no-warmup
+php app/console cache:warmup --env=prod --no-debug
 
-$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

frameworks/Scala/finagle/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 sbt

frameworks/Scala/finagle/setup.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-source $IROOT/java7.installed
-export SBT_HOME=${IROOT}/sbt
+fw_depends java7 sbt
 
-${SBT_HOME}/bin/sbt update compile
+sbt update compile
 
-${SBT_HOME}/bin/sbt -Ddb.host=${DBHOST} run &
+sbt -Ddb.host=${DBHOST} run &

frameworks/Scala/lift-stateless/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 sbt

frameworks/Scala/lift-stateless/setup.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-source $IROOT/java7.installed
-export SBT_HOME=${IROOT}/sbt
+
+fw_depends java7 sbt
 
 sed -i 's|> ".*:3306|> "'"${DBHOST}"':3306|g' src/main/scala/Main.scala
 
-${SBT_HOME}/bin/sbt update assembly
+sbt update assembly
 
-./run &
+./run &

frameworks/Scala/plain/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 sbt

frameworks/Scala/plain/setup.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-export SBT_HOME=${IROOT}/sbt
-source $IROOT/java7.installed
+
+fw_depends java7 sbt
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' src/main/resources/application.conf
 
-${SBT_HOME}/bin/sbt assembly && rm -rf target/scala-2.10/cache
+sbt assembly && rm -rf target/scala-2.10/cache
 
-java -jar target/scala-2.10/plain-benchmark-assembly-1.0.1.jar &
+java -jar target/scala-2.10/plain-benchmark-assembly-1.0.1.jar &

frameworks/Scala/play2-scala/bash_profile.sh

@@ -1 +0,0 @@
-# Intentionally blank

frameworks/Scala/play2-scala/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 sbt

frameworks/Scala/play2-scala/setup_scala.sh

@@ -1,18 +1,15 @@
 #!/bin/bash
 
-source $IROOT/java7.installed
+fw_depends java7 sbt
 
 cd play2-scala
-sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" conf/application.conf
+sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" $TROOT/play2-scala/conf/application.conf
 
-# If application is running, clear old running app.
-if [ -f ${TROOT}/play2-scala/target/universal/stage/RUNNING_PID ]
-then
-  rm -f -r ${TROOT}/play2-scala/target/universal/stage/RUNNING_PID
-fi
+# Clear old running app.
+rm -rf $TROOT/play2-scala/target/universal/stage/RUNNING_PID
 
 # Stage application.
-${IROOT}/sbt/bin/sbt stage
+sbt stage
 
 # Execute Start script in background.
-${TROOT}/play2-scala/target/universal/stage/bin/play2-scala &
+$TROOT/play2-scala/target/universal/stage/bin/play2-scala &

frameworks/Scala/play2-scala/setup_scala_activate.sh

@@ -1,18 +1,14 @@
 #!/bin/bash
 
-source $IROOT/java7.installed
+fw_depends java7 sbt
 
 cd play2-scala-activate
-sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
+sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' $TROOT/play2-scala-activate/conf/application.conf
 
-# If application has an already existing process id, clear it.
-if [ -f ${TROOT}/play2-scala-activate/target/universal/stage/RUNNING_PID ]
-then
-  rm -f -r ${TROOT}/play2-scala-activate/target/universal/stage/RUNNING_PID
-fi
+rm -rf $TROOT/play2-scala-activate/target/universal/stage/RUNNING_PID
 
 # Stage application.
-${IROOT}/sbt/bin/sbt stage
+sbt stage
 
 # Execute Start script in background.
-${TROOT}/play2-scala-activate/target/universal/stage/bin/play2-scala-activate &
+$TROOT/play2-scala-activate/target/universal/stage/bin/play2-scala-activate &

frameworks/Scala/play2-scala/setup_scala_anorm.sh

@@ -1,16 +1,14 @@
 #!/bin/bash
-source $IROOT/java7.installed
+
+fw_depends java7 sbt
+
 cd play2-scala-anorm
-sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" conf/application.conf
+sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" $TROOT/play2-scala-anorm/conf/application.conf
 
-# If application has an already existing process id, clear it.
-if [ -f ${TROOT}/play2-scala-anorm/target/universal/stage/RUNNING_PID ]
-then
-  rm -f -r ${TROOT}/play2-scala-anorm/target/universal/stage/RUNNING_PID
-fi
+rm -f -r $TROOT/play2-scala-anorm/target/universal/stage/RUNNING_PID
 
 # Stage application.
-${IROOT}/sbt/bin/sbt stage
+sbt stage
 
 # Execute Start script in background.
-${TROOT}/play2-scala-anorm/target/universal/stage/bin/play2-scala-anorm &
+$TROOT/play2-scala-anorm/target/universal/stage/bin/play2-scala-anorm &

frameworks/Scala/play2-scala/setup_scala_reactivemongo.sh

@@ -1,18 +1,14 @@
 #!/bin/bash
 
-source $IROOT/java7.installed
+fw_depends java7 sbt
 
 cd play2-scala-reactivemongo
-sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
+sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' $TROOT/play2-scala-reactivemongo/conf/application.conf
 
-# If application has an already existing process id, clear it.
-if [ -f ${TROOT}/play2-scala-reactivemongo/target/universal/stage/RUNNING_PID ]
-then
-  rm -f -r ${TROOT}/play2-scala-reactivemongo/target/universal/stage/RUNNING_PID
-fi
+rm -rf $TROOT/play2-scala-reactivemongo/target/universal/stage/RUNNING_PID
 
 # Stage application.
-${IROOT}/sbt/bin/sbt stage
+sbt stage
 
 # Execute Start script in background.
-${TROOT}/play2-scala-reactivemongo/target/universal/stage/bin/play2-scala-reactivemongo &
+$TROOT/play2-scala-reactivemongo/target/universal/stage/bin/play2-scala-reactivemongo &

frameworks/Scala/play2-scala/setup_scala_slick.sh

@@ -1,17 +1,14 @@
 #!/bin/bash
-source $IROOT/java7.installed
+
+fw_depends java7 sbt
 
 cd play2-scala-slick
-sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" conf/application.conf
+sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" $TROOT/play2-scala-slick/conf/application.conf
 
-# If application is running, clear old running app.
-if [ -f ${TROOT}/play2-scala-slick/target/universal/stage/RUNNING_PID ]
-then
-  rm -f -r ${TROOT}/play2-scala-slick/target/universal/stage/RUNNING_PID
-fi
+rm -rf ${TROOT}/play2-scala-slick/target/universal/stage/RUNNING_PID
 
 # Stage application.
-${IROOT}/sbt/bin/sbt stage
+sbt stage
 
 # Execute Start script in background.
-${TROOT}/play2-scala-slick/target/universal/stage/bin/play2-scala-slick &
+$TROOT/play2-scala-slick/target/universal/stage/bin/play2-scala-slick &

frameworks/Scala/scalatra/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 resin sbt

frameworks/Scala/scalatra/setup.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
-source $IROOT/java7.installed
 
-export RESIN_HOME=${IROOT}/resin-4.0.41
-export SBT_HOME=${IROOT}/sbt
+fw_depends java7 resin sbt
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml
 
-${SBT_HOME}/bin/sbt clean package
+sbt clean package
 
 rm -rf $RESIN_HOME/webapps/*
 cp target/scala-2.10/scalatra*.war $RESIN_HOME/webapps/scalatra.war
-$RESIN_HOME/bin/resinctl start
+
+resinctl start

frameworks/Scala/scruffy/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 sbt

frameworks/Scala/scruffy/setup.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-export SBT_HOME=${IROOT}/sbt
-source $IROOT/java7.installed
+
+fw_depends java7 sbt
 
 sed -i 's|database_host|'"${DBHOST}"'|g' src/main/scala/scruffy/examples/Test2Endpoint.scala
 
-$SBT_HOME/bin/sbt assembly
+sbt assembly
 
-java -jar target/scala-2.11/scruffy-benchmark-assembly-10.1.jar -Dhostname=${DBHOST} &
+java -jar target/scala-2.11/scruffy-benchmark-assembly-10.1.jar -Dhostname=$DBHOST &

frameworks/Scala/spray-es/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-fw_depends java8 sbt
-
-source $IROOT/java8.installed
-export PATH=$IROOT/sbt/bin:$PATH
-
-sbt_opts='-J-XX:+UseG1GC -J-Xmx2G -J-XX:MaxMetaspaceSize=512m'
-
-cd $TROOT
-sbt $sbt_opts package
-sbt $sbt_opts assembly

frameworks/Scala/spray-es/setup.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
-source $IROOT/java8.installed
+fw_depends java8 sbt
+
+sbt_opts='-J-XX:+UseG1GC -J-Xmx2G -J-XX:MaxMetaspaceSize=512m'
+
+sbt $sbt_opts package
+sbt $sbt_opts assembly
 
 java -Dtfb.db_host=$DBHOST -jar target/scala-2.11/spray-es-assembly-0.1.jar &

frameworks/Scala/spray/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 scala sbt

frameworks/Scala/spray/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-export SBT_HOME=${IROOT}/sbt
-source $IROOT/java7.installed
 
-${SBT_HOME}/bin/sbt assembly
+fw_depends java7 scala sbt
 
-java -jar target/scala-2.10/spray-benchmark-assembly-1.0.jar &
+sbt assembly
+
+java -jar target/scala-2.10/spray-benchmark-assembly-1.0.jar &

frameworks/Scala/unfiltered/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 scala sbt

frameworks/Scala/unfiltered/setup_unfiltered.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
-source $IROOT/java7.installed
 
-export SBT_HOME=${IROOT}/sbt
+fw_depends java7 scala sbt
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' src/main/resources/application.conf
 sed -i 's|maxThreads = .*|maxThreads = '"${MAX_THREADS}"'|g' src/main/resources/application.conf
 
-$SBT_HOME/bin/sbt assembly
+sbt assembly
 
 cd target/scala-2.10
-java -jar bench-assembly-1.0.0.jar &
+java -jar bench-assembly-1.0.0.jar &

frameworks/Ur/urweb/install.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-VERSION=20150103
-COMPILER=${IROOT}/urweb
-
-RETCODE=$(fw_exists $COMPILER)
-[ ! "$RETCODE" == 0 ] || [ ! `$COMPILER | grep -oE '[^ ]+$'` == "$VERSION" ] || { return 0; }
-
-fw_get http://www.impredicative.com/ur/urweb-$VERSION.tgz
-fw_untar urweb-$VERSION.tgz
-cd urweb-$VERSION
-./configure --prefix=${IROOT}/urweb
-make
-make install
-
-touch ${IROOT}/urweb.installed

frameworks/Ur/urweb/setup.sh

@@ -1,8 +1,26 @@
 #!/bin/bash
-export URWEB_HOME=${IROOT}/urweb
 
-${URWEB_HOME}/bin/urweb -db "dbname=hello_world user=benchmarkdbuser password=benchmarkdbpass host=${DBHOST}" bench
+VERSION=20150103
+COMPILER=${IROOT}/urweb
 
-export LD_LIBRARY_PATH=${URWEB_HOME}/lib
+RETCODE=$(fw_exists ${COMPILER}.installed)
+[ "$RETCODE" == 0 ] || { \
+  cd $IROOT
+  fw_get http://www.impredicative.com/ur/urweb-$VERSION.tgz
+  fw_untar urweb-$VERSION.tgz
+  cd urweb-$VERSION
+  ./configure --prefix=$IROOT/urweb
+  make
+  make install
+
+  echo "export URWEB_HOME=${COMPILER}" > $COMPILER.installed
+  echo "export LD_LIBRARY_PATH=${COMPILER}/lib" >> $COMPILER.installed
+  echo -e "export PATH=${COMPILER}/bin:\$PATH" >> $COMPILER.installed
+  cd $TROOT
+}
+
+source $IROOT/urweb.installed
+
+urweb -db "dbname=hello_world user=benchmarkdbuser password=benchmarkdbpass host=${DBHOST}" bench
 
 ./bench.exe -q -k -t ${MAX_THREADS} &

toolset/setup/linux/frameworks/cphalcon.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-CPHALCON=$IROOT/cphalcon
-RETCODE=$(fw_exists ${CPHALCON}.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $CPHALCON.installed
-  return 0; }
-
-fw_depends php
-
-# phalcon.so
-#   The configure seems broken, does not respect prefix. If you 
-#   update the value of PATH then it finds the prefix from `which php`
-git clone --depth=1 --branch=phalcon-v1.3.2 --single-branch \
-  --quiet git://github.com/phalcon/cphalcon.git
-cd cphalcon/build/64bits 
-phpize
-# For some reason we have to point to php-config 
-# explicitly, it's not found by the prefix settings
-./configure --prefix=$PHP_HOME --exec-prefix=$PHP_HOME \
-  --with-php-config=$PHP_HOME/bin/php-config \
-  --enable-phalcon --quiet
-make --quiet
-make install
-
-# No variables to set with this framework.
-touch $CPHALCON.installed

toolset/setup/linux/languages/hhvm.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 
 RETCODE=$(fw_exists ${IROOT}/hhvm.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/hhvm.installed
+  return 0; }
 
-sudo add-apt-repository -y ppa:mapnik/v2.2.0
 wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
 echo deb http://dl.hhvm.com/ubuntu `lsb_release -sc` main | sudo tee /etc/apt/sources.list.d/hhvm.list
 sudo apt-get update
 sudo apt-get install -y hhvm
 
-touch ${IROOT}/hhvm.installed
+echo -e "" > $IROOT/hhvm.installed
+
+source $IROOT/hhvm.installed

toolset/setup/linux/languages/php.sh

@@ -45,16 +45,33 @@ echo PHP compilation finished, installing extensions
 $IROOT/php-${VERSION}/bin/pecl channel-update pecl.php.net
 # Apc.so
 $IROOT/php-${VERSION}/bin/pecl config-set php_ini $IROOT/php-${VERSION}/lib/php.ini
-#printf "\n" | $IROOT/php-5.5.17/bin/pecl install -f apc-beta
 printf "\n" | $IROOT/php-${VERSION}/bin/pecl -q install -f redis
 
 # yaf.so
 printf "\n" | $IROOT/php-${VERSION}/bin/pecl -q install -f yaf
 
+# phalcon.so
+#   The configure seems broken, does not respect prefix. If you 
+#   update the value of PATH then it finds the prefix from `which php`
+git clone --depth=1 --branch=phalcon-v1.3.2 --single-branch \
+  --quiet git://github.com/phalcon/cphalcon.git
+cd cphalcon/build/64bits 
+$PHP_HOME/bin/phpize
+# For some reason we have to point to php-config 
+# explicitly, it's not found by the prefix settings
+./configure --prefix=$PHP_HOME --exec-prefix=$PHP_HOME \
+  --with-php-config=$PHP_HOME/bin/php-config \
+  --enable-phalcon --quiet
+make --quiet
+make install
+
+# mongo.so
+printf "\n" | $IROOT/php-${VERSION}/bin/pecl -q install -f mongo
+
 # Clean up a bit
 rm -rf $IROOT/php
 
 echo "export PHP_HOME=${IROOT}/php-5.5.17" > $IROOT/php.installed
-echo "export PATH=${PHP_HOME}/bin:$PHP_HOME/sbin:$PATH" >> $IROOT/php.installed
+echo -e "export PATH=${PHP_HOME}/bin:$PHP_HOME/sbin:\$PATH" >> $IROOT/php.installed
 
 source $IROOT/php.installed

toolset/setup/linux/systools/composer.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/php-composer.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+COMPOSER_HOME=$IROOT/php-composer
+RETCODE=$(fw_exists ${COMPOSER_HOME}.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $COMPOSER_HOME.installed
+  return 0; }
 
 fw_depends php
 
-PHP_HOME=${PHP_HOME:-${IROOT}/php-5.5.17}
-
 mkdir -p php-composer
 cd php-composer
 
@@ -17,4 +18,8 @@ fw_get https://getcomposer.org/installer -O composer-installer.php
 ${PHP_HOME}/bin/php composer-installer.php --install-dir=${COMPOSER_HOME}
 
 cd ..
-touch ${IROOT}/php-composer.installed
+
+echo "export COMPOSER_HOME=${COMPOSER_HOME}" > $COMPOSER_HOME.installed
+echo -e "${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install --no-interaction --working-dir \$TROOT --no-progress --optimize-autoloader" >> $COMPOSER_HOME.installed
+
+source $COMPOSER_HOME.installed