Refactor out bash profiles

frameworks/Elixir/phoenix/bash_profile.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export REBAR_HOME=$IROOT/rebar
-export ERL_BIN=$IROOT/erlang/bin
-export ERL_LIB=$IROOT/erlang/lib
-export ELX_BIN=$IROOT/elixir/bin
-export ELX_LIB=$IROOT/elixir/bin

frameworks/Elixir/phoenix/setup.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-export PATH=$PATH:$ERL_BIN:$ELX_BIN
+source $IROOT/elixir.installed
 
-# sed -i 's|db_host: "localhost",|db_host: "${DBHOST}",|g' config/config.exs
+sed -i 's|db_host: "localhost",|db_host: "${DBHOST}",|g' config/config.exs
 
 rm -rf _build deps
 

frameworks/Erlang/cowboy/bash_profile.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export REBAR_HOME=$IROOT/rebar
-export ERL_BIN=$IROOT/erlang/bin
-export ERL_LIB=$IROOT/erlang/lib

frameworks/Erlang/cowboy/setup_erlang.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-export REBAR_HOME=$IROOT/rebar
 
-export PATH=$PATH:$ERL_BIN
+source $IROOT/rebar.installed
+source $IROOT/erlang.installed
 
 sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/hello_world_app.erl
 

frameworks/Erlang/elli/bash_profile.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export REBAR_HOME=$IROOT/rebar
-export ERL_BIN=$IROOT/erlang/bin
-export ERL_LIB=$IROOT/erlang/lib

frameworks/Erlang/elli/setup_erlang.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-export REBAR_HOME=$IROOT/rebar
 
-export PATH=$PATH:$ERL_BIN
+source $IROOT/erlang.installed
+source $IROOT/rebar.installed
 
 sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/elli_bench_sup.erl
 

toolset/setup/linux/languages/elixir.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/elixir.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+RETCODE=$(fw_exists $IROOT/elixir.installed)
+[ ! "$RETCODE" == 0 ] || { . $IROOT/elixir.installed; return 0; }
 
 fw_depends erlang
 export PATH=$PATH:$IROOT/erlang/bin
 
 VERSION="1.0.4"
-fw_get https://codeload.github.com/elixir-lang/elixir/tar.gz/v${VERSION}
-fw_untar v${VERSION}
+fw_get https://codeload.github.com/elixir-lang/elixir/tar.gz/v$VERSION
+fw_untar v$VERSION
 
 (
-	mv elixir-${VERSION} elixir
+	mv elixir-$VERSION elixir
 	cd elixir
 	make compile
 )
 
-touch ${IROOT}/elixir.installed
+echo "export PATH=$PATH:$IROOT/erlang/bin:$IROOT/elixir/bin" >> $IROOT/elixir.installed

toolset/setup/linux/languages/erlang.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/erlang.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+RETCODE=$(fw_exists $IROOT/erlang.installed)
+[ ! "$RETCODE" == 0 ] || { . $IROOT/erlang.installed; return 0; }
 
 export OTP_SRC="otp_src_17.5"
 fw_get http://www.erlang.org/download/${OTP_SRC}.tar.gz
@@ -15,4 +15,4 @@ fw_untar ${OTP_SRC}.tar.gz
 	make install
 )
 
-touch ${IROOT}/erlang.installed
+echo "export PATH=$PATH:$IROOT/erlang/bin" >> $IROOT/erlang.installed

toolset/setup/linux/systools/rebar.sh

@@ -4,7 +4,7 @@ RETCODE=$(fw_exists $IROOT/rebar.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_depends erlang
-export PATH=$PATH:$IROOT/erlang/bin
+source $IROOT/erlang.installed
 
 fw_get https://github.com/rebar/rebar/archive/2.5.1.tar.gz -O rebar-2.5.1.tar.gz
 fw_untar rebar-2.5.1.tar.gz
@@ -12,4 +12,4 @@ mv rebar-2.5.1 rebar
 cd rebar
 ./bootstrap
 
-touch $IROOT/rebar.installed
+echo "export REBAR_HOME=$IROOT/rebar" >> $IROOT/rebar.installed