Merged with latest master

frameworks/Clojure/aleph/install.sh

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

frameworks/Clojure/aleph/setup.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-source $IROOT/java7.installed
-
-source $IROOT/lein.installed
+fw_depends java7 leiningen
 
 cd hello
 lein clean
 lein uberjar
-java -server -Xmx2g -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -jar target/*-standalone.jar &
+java -server -Xmx2g -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -jar target/*-standalone.jar &

frameworks/JavaScript/express/install.sh

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

frameworks/JavaScript/express/setup.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
+fw_depends nvm nodejs
+
 sed -i 's|mongodb://.*/hello_world|mongodb://'"${DBHOST}"'/hello_world|g' app.js
 sed -i 's|localhost|'"${DBHOST}"'|g' app.js
 
-fw_depends nvm nodejs
-
 # run app
 npm install
 node app &

frameworks/PHP/cygnite-php-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/cygnite-php-framework/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' apps/configs/database.php
 sed -i 's|root .*/FrameworkBenchmarks/cygnite-php-framework|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/Python/historical/install.sh

@@ -1,18 +0,0 @@
-
-export PY2_ROOT=$IROOT/py2
-export PY2=$PY2_ROOT/bin/python
-export PY2_PIP=$PY2_ROOT/bin/pip
-
-mkdir -p $IROOT/.pip_cache
-export PIP_DOWNLOAD_CACHE=$IROOT/.pip_cache
-
-fw_depends python2 apache
-
-$PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/webware/requirements.txt
-
-cd $TROOT/webware 
-rm -fr Webware Webware-1.1.1
-rm Webware-1.1.1.tar.gz
-wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
-tar -xf Webware-1.1.1.tar.gz
-cp -r app/ Webware-1.1.1/

frameworks/Python/historical/webware/setup.sh

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-export PY2_ROOT=$IROOT/py2
-export PY2=$PY2_ROOT/bin/python
+fw_depends python2 apache
+
+cd webware 
+rm -fr Webware Webware-1.1.1 Webware-1.1.1.tar.gz
+
+wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
+tar -xf Webware-1.1.1.tar.gz
+cp -r app/ Webware-1.1.1/
 
 cd $TROOT/webware/Webware-1.1.1
 $PY2 install.py --no-password-prompt 

frameworks/Python/klein/install.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-export PY2_ROOT=$IROOT/py2
-export PY2=$PY2_ROOT/bin/python
-export PY2_PIP=$PY2_ROOT/bin/pip
-
-export PY3_ROOT=$IROOT/py3
-export PY3=$PY3_ROOT/bin/python3
-export PY3_PIP=$PY3_ROOT/bin/pip3
-
-mkdir -p $IROOT/.pip_cache
-export PIP_DOWNLOAD_CACHE=$IROOT/.pip_cache
-
-fw_depends python2 python3
-
-$PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
-
-$PY3_PIP install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
-

frameworks/Python/klein/setup.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-export PY2_ROOT=$IROOT/py2
-export PY2=$PY2_ROOT/bin/python
+fw_depends python2
 
-$PY2 app.py &
+$PY2_ROOT/bin/python app.py &

frameworks/Scala/colossus/install.sh

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

frameworks/Scala/colossus/setup.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-source $IROOT/java8.installed
-export SBT_HOME=${IROOT}/sbt
+fw_depends java8 sbt
 
-${SBT_HOME}/bin/sbt 'oneJar'
+sbt 'oneJar'
 
 java -jar target/scala-2.11/colossus*one-jar.jar
-