Merge pull request #1478 from LadyMozzarella/lgratrix-remove-bash-profile

Toolset: Remove bash_profile.sh

frameworks/C++/ULib/bash_profile.sh

@@ -1,16 +0,0 @@
-#---------------------------------------------------------------------------------------------------------
-# bash_profile.sh - set the environment of our ULib installation
-#---------------------------------------------------------------------------------------------------------
-# TROOT - Path of this test's directory
-# IROOT - Path of this test's install directory ($FWROOT/installs or $FWROOT/installs/pertest/<test-name>)
-#---------------------------------------------------------------------------------------------------------
-# INFO:root:Running installation for ULib
-# INSTALL: 
-#    export TROOT=$FWROOT/ULib && 
-#    export IROOT=$FWROOT/installs && 
-#    . $FWROOT/toolset/setup/linux/bash_functions.sh && 
-#    . $FWROOT/ULib/install.sh (cwd=$FWROOT//installs)
-#---------------------------------------------------------------------------------------------------------
-export ULIB_VERSION=1.4.2
-export ULIB_ROOT=$IROOT/ULib
-export ULIB_DOCUMENT_ROOT=${ULIB_ROOT}/ULIB_DOCUMENT_ROOT

frameworks/C++/ULib/setup.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+export ULIB_VERSION=1.4.2
+export ULIB_ROOT=$IROOT/ULib
+export ULIB_DOCUMENT_ROOT=${ULIB_ROOT}/ULIB_DOCUMENT_ROOT
+
 export UMEMPOOL="136,0,0,85,1160,155,-17,-22,40"
 
 # 1. Change ULib Server configuration

frameworks/C++/ULib/setup_mysql.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+export ULIB_VERSION=1.4.2
+export ULIB_ROOT=$IROOT/ULib
+export ULIB_DOCUMENT_ROOT=${ULIB_ROOT}/ULIB_DOCUMENT_ROOT
+
 export ORM_DRIVER="mysql"
 export ORM_OPTION="host=${DBHOST} user=benchmarkdbuser password=benchmarkdbpass character-set=utf8 dbname=hello_world"
 

frameworks/C++/ULib/setup_sqlite.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+export ULIB_VERSION=1.4.2
+export ULIB_ROOT=$IROOT/ULib
+export ULIB_DOCUMENT_ROOT=${ULIB_ROOT}/ULIB_DOCUMENT_ROOT
+
 export ORM_DRIVER="sqlite"
 export ORM_OPTION="host=${DBHOST} user=benchmarkdbuser password=benchmarkdbpass character-set=utf8 dbname=${ULIB_ROOT}/db/%.*s"
 

frameworks/C++/cpoll_cppsp/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export CPPSP_HOME=$IROOT/cppsp_0.2.3

frameworks/C++/cpoll_cppsp/setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export CPPSP_HOME=$IROOT/cppsp_0.2.3
 
 sed -i 's|#define BENCHMARK_DB_HOST ".*"|#define BENCHMARK_DB_HOST "'"$DBHOST"'"|g' www/connectioninfo.H
 

frameworks/C++/wt/bash_profile.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-export BOOST_ROOT=/usr/local
-export BOOST_INC=${BOOST_ROOT}/include
-export BOOST_LIB=${BOOST_ROOT}/lib
-
-export WT_ROOT=${IROOT}/wt
-export WT_LIB=${WT_ROOT}/lib
-export WT_INC=${WT_ROOT}/include
-
-export LD_LIBRARY_PATH="${BOOST_LIB}:${WT_LIB}:${LD_LIBRARY_PATH}"

frameworks/C++/wt/install.sh

@@ -1,3 +1,13 @@
 #!/bin/bash
 
+export BOOST_ROOT=/usr/local
+export BOOST_INC=${BOOST_ROOT}/include
+export BOOST_LIB=${BOOST_ROOT}/lib
+
+export WT_ROOT=${IROOT}/wt
+export WT_LIB=${WT_ROOT}/lib
+export WT_INC=${WT_ROOT}/include
+
+export LD_LIBRARY_PATH="${BOOST_LIB}:${WT_LIB}:${LD_LIBRARY_PATH}"
+
 fw_depends apache wt

frameworks/C++/wt/setup.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
+export BOOST_ROOT=/usr/local
+export BOOST_INC=${BOOST_ROOT}/include
+export BOOST_LIB=${BOOST_ROOT}/lib
+
+export WT_ROOT=${IROOT}/wt
+export WT_LIB=${WT_ROOT}/lib
+export WT_INC=${WT_ROOT}/include
 
 # This has to be included here since it is one of the vars NOT copied from the original environment
 export LD_LIBRARY_PATH="${BOOST_LIB}:${WT_LIB}:${LD_LIBRARY_PATH}"

frameworks/C++/wt/setup_postgres.sh

@@ -1,7 +1,15 @@
 #!/bin/bash
+export BOOST_ROOT=/usr/local
+export BOOST_INC=${BOOST_ROOT}/include
+export BOOST_LIB=${BOOST_ROOT}/lib
+
+export WT_ROOT=${IROOT}/wt
+export WT_LIB=${WT_ROOT}/lib
+export WT_INC=${WT_ROOT}/include
 
 # This has to be included here since it is one of the vars NOT copied from the original environment
 export LD_LIBRARY_PATH="${BOOST_LIB}:${WT_LIB}:${LD_LIBRARY_PATH}"
+export CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.3/server:$CPLUS_INCLUDE_PATH
 
 sed -i 's|INSERT_DB_HOST_HERE|'"${DBHOST}"'|g' benchmark.cpp
 

frameworks/C/duda/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export DUDA_HOME=${IROOT}/dudac-0.23

frameworks/C/duda/setup.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export DUDA_HOME=${IROOT}/dudac-0.23
 export PATH=${DUDA_HOME}:$PATH
 
 dudac -w $TROOT/webservice -p 2001 &

frameworks/Clojure/compojure/bash_profile.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41
-export LEIN_HOME=$IROOT/lein

frameworks/Clojure/compojure/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.41
+export LEIN_HOME=$IROOT/lein
 
 # Path vars must be set here
 export PATH="$JAVA_HOME/bin:$PATH"

frameworks/Clojure/http-kit/bash_profile.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-
-export LEIN_HOME=$IROOT/lein

frameworks/Clojure/http-kit/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export LEIN_HOME=$IROOT/lein
 
 cd hello
 $LEIN_HOME/bin/lein clean

frameworks/Clojure/luminus/bash_profile.sh

@@ -1,2 +0,0 @@
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Clojure/luminus/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.41
 
 # Path vars must be set here
 export PATH="$JAVA_HOME/bin:$PATH"

frameworks/Dart/dart-redstone/bash_profile.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export DART_HOME=$IROOT/dart-sdk
-
-export PUB_CACHE=$IROOT/.pubcache

frameworks/Dart/dart-redstone/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export DART_HOME=$IROOT/dart-sdk
+export PUB_CACHE=$IROOT/.pubcache
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml

frameworks/Dart/dart-start/bash_profile.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export DART_HOME=$IROOT/dart-sdk
-
-export PUB_CACHE=$IROOT/.pubcache
-
-export NGINX_HOME=$IROOT/nginx

frameworks/Dart/dart-start/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+export DART_HOME=$IROOT/dart-sdk
+export PUB_CACHE=$IROOT/.pubcache
+export NGINX_HOME=$IROOT/nginx
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml

frameworks/Dart/dart-stream/bash_profile.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export DART_HOME=$IROOT/dart-sdk
-
-export PUB_CACHE=$IROOT/.pubcache
-
-export NGINX_HOME=$IROOT/nginx

frameworks/Dart/dart-stream/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+export DART_HOME=$IROOT/dart-sdk
+export PUB_CACHE=$IROOT/.pubcache
+export NGINX_HOME=$IROOT/nginx
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml

frameworks/Dart/dart/bash_profile.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export DART_HOME=$IROOT/dart-sdk
-
-export PUB_CACHE=$IROOT/.pubcache

frameworks/Dart/dart/setup.sh

@@ -2,6 +2,10 @@
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
 
+export DART_HOME=$IROOT/dart-sdk
+
+export PUB_CACHE=$IROOT/.pubcache
+
 $DART_HOME/bin/pub upgrade
 
-$DART_HOME/bin/dart server.dart -a 0.0.0.0 -p 8080 -d ${MAX_THREADS} -i ${MAX_THREADS} &
+$DART_HOME/bin/dart server.dart -a 0.0.0.0 -p 8080 -d ${MAX_THREADS} -i ${MAX_THREADS} &

frameworks/Erlang/cowboy/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export REBAR_HOME=$IROOT/rebar

frameworks/Erlang/cowboy/setup_erlang.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export REBAR_HOME=$IROOT/rebar
 
 sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/hello_world_app.erl
 

frameworks/Erlang/elli/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export REBAR_HOME=$IROOT/rebar

frameworks/Erlang/elli/setup_erlang.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export REBAR_HOME=$IROOT/rebar
 
 sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/elli_bench_sup.erl
 

frameworks/Go/beego/bash_profile.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}

frameworks/Go/beego/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# Set the root of our go installation
+export GOROOT=${IROOT}/go
+export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/hello/hello.go
 

frameworks/Go/falcore/bash_profile.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}

frameworks/Go/falcore/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# Set the root of our go installation
+export GOROOT=${IROOT}/go
+export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/framework_benchmarks/falcore.go
 

frameworks/Go/gin/bash_profile.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}

frameworks/Go/gin/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# Set the root of our go installation
+export GOROOT=${IROOT}/go
+export GOPATH=${TROOT}
 
 # Where to find the go executable
 export PATH="$GOROOT/bin:$PATH"

frameworks/Go/go/bash_profile.sh

@@ -1,4 +0,0 @@
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}

frameworks/Go/go/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# Set the root of our go installation
+export GOROOT=${IROOT}/go
+export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/hello/hello.go
 

frameworks/Go/revel-jet/bash_profile.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}

frameworks/Go/revel-jet/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# Set the root of our go installation
+export GOROOT=${IROOT}/go
+export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 

frameworks/Go/revel-qbs/bash_profile.sh

@@ -1,4 +0,0 @@
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}

frameworks/Go/revel-qbs/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# Set the root of our go installation
+export GOROOT=${IROOT}/go
+export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 

frameworks/Go/revel/bash_profile.sh

@@ -1,4 +0,0 @@
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}

frameworks/Go/revel/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# Set the root of our go installation
+export GOROOT=${IROOT}/go
+export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 

frameworks/Go/webgo/bash_profile.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}

frameworks/Go/webgo/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# Set the root of our go installation
+export GOROOT=${IROOT}/go
+export GOPATH=${TROOT}
 
 # Where to find the go executable
 export PATH="$GOROOT/bin:$PATH"

frameworks/Groovy/grails/setup.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
+
 export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
 export RESIN_HOME=${IROOT}/resin-4.0.41
-
 export GRAILS_PATH=${IROOT}/grails-2.4.4/bin/
 
-sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' hello/grails-app/conf/DataSource.groovy
-
 export PATH=${GRAILS_PATH}:$PATH
 export GRAILS_AGENT_CACHE_DIR=${IROOT}/.grails/.slcache
 
+sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' hello/grails-app/conf/DataSource.groovy
+
 cd hello
 grails -Dgrails.work.dir=${IROOT}/.grails -non-interactive -plain-output refresh-dependencies
 grails -Dgrails.work.dir=${IROOT}/.grails -non-interactive -plain-output compile

frameworks/Haskell/snap/bash_profile.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export CABAL_HOME=/opt/cabal/1.20
-export HASKELL_HOME=/opt/ghc/7.8.3
-export LANG=en_US.UTF-8

frameworks/Haskell/snap/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+export CABAL_HOME=/opt/cabal/1.20
+export HASKELL_HOME=/opt/ghc/7.8.3
+export LANG=en_US.UTF-8
 
 sed -i 's|host=".*"|host="'"${DBHOST}"'"|g' bench/cfg/db.cfg
 

frameworks/Haskell/wai/bash_profile.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export CABAL_HOME=/opt/cabal/1.20
-export HASKELL_HOME=/opt/ghc/7.8.3
-export LANG=en_US.UTF-8

frameworks/Haskell/wai/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+export CABAL_HOME=/opt/cabal/1.20
+export HASKELL_HOME=/opt/ghc/7.8.3
+export LANG=en_US.UTF-8
 
 export PATH=${HASKELL_HOME}/bin:$PATH
 

frameworks/Java/README.md

@@ -10,6 +10,6 @@ that contains at least
 This installs the OpenJDK 7 JVM.
 
 Frameworks can also choose to install Oracle Java 8 JVM by declaring a dependency on "java8"
-instead of java. In order to use Java 8 JVM frameworks need to add the following line in their "bash_profile.sh" file:
+instead of java. In order to use Java 8 JVM frameworks need to add the following line in their "setup.sh" file:
 
 export JAVA_HOME=/opt/java8

frameworks/Java/activeweb/bash_profile.sh

@@ -1,2 +0,0 @@
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Java/activeweb/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/java/app/config/DbConfig.java

frameworks/Java/gemini/bash_profile.sh

@@ -1,2 +0,0 @@
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Java/gemini/setup.sh

@@ -7,6 +7,9 @@
 # of their initial setup.  On Windows, the script can be run through 
 # Git bash.
 
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.41
+
 projectName="GeminiHello"
 machineNameUpper="`echo $HOSTNAME|tr '[a-z]' '[A-Z]'`"
 machineNameLower="`echo $HOSTNAME|tr '[A-Z]' '[a-z]'`"

frameworks/Java/play1/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export PLAY1_HOME=${IROOT}/play-1.2.5

frameworks/Java/play1/setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export PLAY1_HOME=${IROOT}/play-1.2.5
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 

frameworks/Java/play1siena/bash_profile.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export PLAY1_HOME=${IROOT}/play-1.2.5
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Java/play1siena/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export PLAY1_HOME=${IROOT}/play-1.2.5
+export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 

frameworks/Java/play2-java/bash_profile.sh

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

frameworks/Java/servlet/bash_profile.sh

@@ -1 +0,0 @@
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Java/servlet/setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml
 

frameworks/Java/servlet3-cass/bash_profile.sh

@@ -1,3 +0,0 @@
-export JAVA_HOME=/opt/java8
-export JAVA_EXE=$JAVA_HOME/bin/java
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Java/servlet3-cass/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-
-#!/bin/bash
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/resources/application.properties
 

frameworks/Java/spark/bash_profile.sh

@@ -1,2 +0,0 @@
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Java/spark/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml
 

frameworks/Java/tapestry/bash_profile.sh

@@ -1,2 +0,0 @@
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Java/tapestry/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' hello/src/main/webapp/WEB-INF/resin-web.xml
 

frameworks/Java/wicket/bash_profile.sh

@@ -1 +0,0 @@
-export RESIN_HOME=${IROOT}/resin-4.0.41

frameworks/Java/wicket/setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml
 

frameworks/JavaScript/express/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export NODE_HOME=${IROOT}/node-v0.10.8-linux-x64

frameworks/JavaScript/express/setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export NODE_HOME=${IROOT}/node-v0.10.8-linux-x64
 
 sed -i 's|mongodb://.*/hello_world|mongodb://'"${DBHOST}"'/hello_world|g' app.js
 sed -i 's|localhost|'"${DBHOST}"'|g' app.js

frameworks/JavaScript/hapi/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export NODE_HOME=${IROOT}/node-v0.10.8-linux-x64

frameworks/JavaScript/hapi/setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export NODE_HOME=${IROOT}/node-v0.10.8-linux-x64
 
 sed -i 's|localhost|'"${DBHOST}"'|g' app.js
 

frameworks/JavaScript/nodejs/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export NODE_HOME=${IROOT}/node-v0.10.8-linux-x64

frameworks/JavaScript/nodejs/install.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+export NODE_HOME=${IROOT}/node-v0.10.8-linux-x64
+
 fw_depends nodejs

frameworks/JavaScript/nodejs/setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export NODE_HOME=${IROOT}/node-v0.10.8-linux-x64
 
 sed -i 's|localhost|'"${DBHOST}"'|g' hello.js
 sed -i 's|mongodb//.*/hello_world|mongodb//'"${DBHOST}"'/hello_world|g' hello.js

frameworks/Lua/lapis/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export OPENRESTY_HOME=${IROOT}/openresty-1.7.7.1

frameworks/Lua/lapis/setup.sh

@@ -4,6 +4,7 @@ sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' config.lua
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' config.moon
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' nginx.conf
 
-export PATH=${OPENRESTY_HOME}/nginx/sbin:$PATH
+export LAPIS_OPENRESTY=${IROOT}/openresty-1.7.7.1
+export PATH=${LAPIS_OPENRESTY}/nginx/sbin:$PATH
 
 lapis server production &

frameworks/Lua/openresty/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export OPENRESTY_HOME=${IROOT}/openresty-1.7.7.1

frameworks/Lua/openresty/setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export OPENRESTY_HOME=${IROOT}/openresty-1.7.7.1
 
 sed -i 's|CWD|'"${TROOT}"'|g' nginx.conf
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' app.lua

frameworks/PHP/README.md

@@ -100,7 +100,7 @@ install the dependencies required by your project.
     fw_depends php composer 
     
     # Download dependencies
-    ${IROOT}/php-5.5.17/bin/php $IROOT/composer.phar install \
+    ${IROOT}/php-5.5.17/bin/php ${COMPOSER_HOME}/composer.phar install \
     --no-interaction --working-dir $TROOT --no-progress \
     --optimize-autoloader 
 
@@ -139,7 +139,7 @@ queries as they are shown. Use these steps
     # This will manually prompt you for your Github credentials 
     # to avoid the Github rate limit
     # When this command completes, you will have a lock file 
-    ${IROOT}/php-5.5.17/bin/php $IROOT/composer.phar install \
+    ${IROOT}/php-5.5.17/bin/php ${COMPOSER_HOME}/composer.phar install \
       --working-dir $TROOT
     
     # Add the lock file to this repository

frameworks/PHP/Yii2/bash_profile.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-
-export NGINX_HOME=${IROOT}/nginx

frameworks/PHP/Yii2/install.sh

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

frameworks/PHP/Yii2/setup.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+export PHP_HOME=${IROOT}/php-5.5.17
+export PHP_FPM=$PHP_HOME/sbin/php-fpm
+export NGINX_HOME=${IROOT}/nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' app/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-yii2|root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/cakephp/install.sh

@@ -1,11 +1,12 @@
 #!/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 $IROOT/composer.phar install \
+${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
   --no-interaction --working-dir $TROOT \
   --no-progress --optimize-autoloader 

frameworks/PHP/codeigniter/install.sh

@@ -1,13 +1,12 @@
 #!/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 PHP_FPM=${PHP_HOME}/sbin/php-fpm
 export NGINX_HOME=${IROOT}/nginx
 
 fw_depends php nginx composer
 
-${PHP_HOME}/bin/php $IROOT/composer.phar install \
+${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
   --no-interaction --working-dir $TROOT \
   --no-progress --optimize-autoloader 

frameworks/PHP/fuel/bash_profile.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-
-export NGINX_HOME=${IROOT}/nginx

frameworks/PHP/fuel/install.sh

@@ -1,12 +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
 
-${PHP_HOME}/bin/php $IROOT/composer.phar install \
+${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
   --no-interaction --working-dir $TROOT \
   --no-progress --optimize-autoloader 

frameworks/PHP/fuel/setup.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+export PHP_HOME=${IROOT}/php-5.5.17
+export PHP_FPM=$PHP_HOME/sbin/php-fpm
+export NGINX_HOME=${IROOT}/nginx
+
 
 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

frameworks/PHP/hhvm/bash_profile.sh

@@ -1,9 +0,0 @@
-#!/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

frameworks/PHP/hhvm/setup_hhvm.sh

@@ -1,5 +1,10 @@
 #!/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
+
 sed -i 's|host=localhost;|host='"${DBHOST}"';|g' once.php.inc
 sed -i 's|SourceRoot = .*/FrameworkBenchmarks/hhvm|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf
 sed -i 's|Path = .*/.hhvm.hhbc|Path = '"${TROOT}"'/.hhvm.bbhc|g' deploy/config.hdf

frameworks/PHP/kohana/install.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
-
-fw_depends php nginx composer
-
 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
 
-${PHP_HOME}/bin/php $IROOT/composer.phar install \
+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/install.sh

@@ -1,14 +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
 
-${PHP_HOME}/bin/php $IROOT/composer.phar install \
+${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
   --no-interaction --working-dir $TROOT \
   --no-progress --optimize-autoloader 
 

frameworks/PHP/php-fatfree/bash_profile.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-
-export NGINX_HOME=${IROOT}/nginx

frameworks/PHP/php-fatfree/setup.sh

@@ -1,5 +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
+
 sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|.*/FrameworkBenchmarks/php-fatfree|'"${TROOT}"'|g' deploy/php
 sed -i 's|Directory .*/FrameworkBenchmarks/php-fatfree|Directory '"${TROOT}"'|g' deploy/php

frameworks/PHP/php-laravel/install.sh

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

frameworks/PHP/php-laravel/setup.sh

@@ -1,6 +1,7 @@
 #!/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
 
@@ -11,4 +12,4 @@ sed -i 's|/home/vagrant/FrameworkBenchmarks/installs/nginx/|'"${IROOT}"'/nginx/|
 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
+${NGINX_HOME}/sbin/nginx -c ${TROOT}/deploy/nginx.conf

frameworks/PHP/php-micromvc/bash_profile.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-
-export NGINX_HOME=${IROOT}/nginx