Browse Source

Remove chmod

msmith-techempower 10 years ago
parent
commit
a428c49bdc

+ 5 - 7
toolset/setup/linux/languages/java7.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 
 JAVA=$IROOT/java7
-INSTALLED=$JAVA.installed
-RETCODE=$(fw_exists ${INSTALLED})
+RETCODE=$(fw_exists ${JAVA}.installed)
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables
-  source $INSTALLED
+  source $JAVA.installed
   return 0; }
 
 # First remove java6
@@ -15,8 +14,7 @@ sudo apt-get install -y openjdk-7-jdk
 
 # Setup environment variables
 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
+echo "export JAVA_HOME=${JAVA_HOME}" > $JAVA.installed
+echo "export PATH=${JAVA_HOME}/bin:$PATH" >> $JAVA.installed
 
-source $INSTALLED
+source $JAVA.installed

+ 5 - 5
toolset/setup/linux/systools/maven.sh

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

+ 5 - 7
toolset/setup/linux/webservers/resin.sh

@@ -3,11 +3,10 @@
 RVER=4.0.41
 RESIN=resin-$RVER
 RESIN_HOME=$IROOT/$RESIN
-INSTALLED=$RESIN_HOME.installed
-RETCODE=$(fw_exists ${INSTALLED})
+RETCODE=$(fw_exists ${RESIN_HOME}.installed)
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables
-  source $INSTALLED
+  source $RESIN_HOME.installed
   return 0; }
 
 fw_depends java7
@@ -26,8 +25,7 @@ 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=${RESIN_HOME}" > $INSTALLED
-echo "export PATH=${RESIN_HOME}/bin:$PATH" >> $INSTALLED
-chmod +x $INSTALLED
+echo "export RESIN_HOME=${RESIN_HOME}" > $RESIN_HOME.installed
+echo "export PATH=${RESIN_HOME}/bin:$PATH" >> $RESIN_HOME.installed
 
-source $INSTALLED
+source $RESIN_HOME.installed