Changeset 26824 for local

Timestamp:

2013-01-31T09:53:47+13:00 (11 years ago)

Author:

davidb

Message:

Moved Java setting to top of file

File:

• local/greenstone3/linux-64bit/gs3-setup.sh (modified) (2 diffs)

local/greenstone3/linux-64bit/gs3-setup.sh

@@ +1 @@
+
+#-- Java --
+
+if [ "x$JAVA_HOME" = "x" ] ; then
+
+  # export JAVA_HOME=/research/local/jdk-64bit-1.7
+  export JAVA_HOME=/research/root/jdk1.6.0_27
+
+  # Some other possible places that Java's SDK might be installed:
+  #  export JAVA_HOME=/usr/lib/jvm/java-1.6.0
+  #  export JAVA_HOME=/opt/openjdk-1.6.0
+
+  export PATH=$JAVA_HOME/bin:$PATH
+  echo "+ Setting JAVA_HOME to:"
+  echo "+   $JAVA_HOME"
+  echo "+ and updating PATH"
+fi
 
 #-- Ant --
@@ -12 +29 @@
 fi
 
-#-- Java --
-
-if [ "x$JAVA_HOME" = "x" ] ; then
-
-  export JAVA_HOME=/research/local/jdk-64bit-1.7
-
-  # Some other possible places that Java's SDK might be installed:
-  #  export JAVA_HOME=/usr/lib/jvm/java-1.6.0
-  #  export JAVA_HOME=/opt/openjdk-1.6.0
-
-  export PATH=$JAVA_HOME/bin:$PATH
-  echo "+ Setting JAVA_HOME to:"
-  echo "+   $JAVA_HOME"
-  echo "+ and updating PATH"
-fi
-
 #-- 
 # Assuming 'svn' is already on your path