Cleaning up installation scripts

toolset/setup/linux/languages/java7.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 
-# TODO include a check before we do all this, because it's 
-# annoyingly slow to run apt-get if we don't need to
-
-RETCODE=$(fw_exists java7.installed)
+JAVA=$IROOT/java7
+INSTALLED=$JAVA.installed
+RETCODE=$(fw_exists ${INSTALLED})
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables
-  . $IROOT/java7.installed
+  source $INSTALLED
   return 0; }
 
 # First remove java6
@@ -15,8 +14,9 @@ sudo apt-get remove -y --purge openjdk-6-jre openjdk-6-jre-headless
 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
-chmod +x $IROOT/java7.installed
+JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-`dpkg --print-architecture`
+echo "export JAVA_HOME=${JAVA_HOME}" > $INSTALLED
+echo "export PATH=${JAVA_HOME}/bin:$PATH" >> $INSTALLED
+chmod +x $INSTALLED
 
-. $IROOT/java7.installed
+source $INSTALLED

toolset/setup/linux/systools/maven.sh

@@ -1,9 +1,14 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/maven.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+INSTALLED=$IROOT/maven.installed
+RETCODE=$(fw_exists ${INSTALLED})
+[ ! "$RETCODE" == 0 ] || { \
+  source $INSTALLED
+  return 0; }
 
 sudo apt-get -y install maven
 mvn -version
 
-touch ${IROOT}/maven.installed
+touch $INSTALLED
+
+source $INSTALLED

toolset/setup/linux/webservers/resin.sh

@@ -1,19 +1,21 @@
 #!/bin/bash
 
 RVER=4.0.41
-
-RETCODE=$(fw_exists ${IROOT}/resin-${RVER}.installed)
+RESIN=resin-$RVER
+RESIN_HOME=$IROOT/$RESIN
+INSTALLED=$RESIN_HOME.installed
+RETCODE=$(fw_exists ${INSTALLED})
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables
-  . $IROOT/resin-$RVER.installed 
+  source $INSTALLED
   return 0; }
 
 fw_depends java7
 sudo cp -r $JAVA_HOME/include $JAVA_HOME/jre/bin/
 
-fw_get http://www.caucho.com/download/resin-$RVER.tar.gz
-fw_untar resin-$RVER.tar.gz
-cd resin-$RVER
+fw_get http://www.caucho.com/download/$RESIN.tar.gz
+fw_untar $RESIN.tar.gz
+cd $RESIN
 ./configure --prefix=`pwd`
 make
 make install
@@ -24,7 +26,8 @@ cat $FWROOT/config/resin.properties > conf/resin.properties
 mv conf/resin.xml conf/resin.xml.orig
 cat $FWROOT/config/resin.xml > conf/resin.xml
 
-echo "export RESIN_HOME=${IROOT}/resin-${RVER}" > ${IROOT}/resin-$RVER.installed
-chmod +x ${IROOT}/resin-$RVER.installed
+echo "export RESIN_HOME=${RESIN_HOME}" > $INSTALLED
+echo "export PATH=${RESIN_HOME}/bin:$PATH" >> $INSTALLED
+chmod +x $INSTALLED
 
-. ${IROOT}/resin-$RVER.installed
+source $INSTALLED