Changeset 26824


Ignore:
Timestamp:
2013-01-31T09:53:47+13:00 (9 years ago)
Author:
davidb
Message:

Moved Java setting to top of file

File:
1 edited

Legend:

Unmodified
Added
Removed
  • local/greenstone3/linux-64bit/gs3-setup.sh

    r26671 r26824  
     1
     2#-- Java --
     3
     4if [ "x$JAVA_HOME" = "x" ] ; then
     5
     6  # export JAVA_HOME=/research/local/jdk-64bit-1.7
     7  export JAVA_HOME=/research/root/jdk1.6.0_27
     8
     9  # Some other possible places that Java's SDK might be installed:
     10  #  export JAVA_HOME=/usr/lib/jvm/java-1.6.0
     11  #  export JAVA_HOME=/opt/openjdk-1.6.0
     12
     13  export PATH=$JAVA_HOME/bin:$PATH
     14  echo "+ Setting JAVA_HOME to:"
     15  echo "+   $JAVA_HOME"
     16  echo "+ and updating PATH"
     17fi
    118
    219#-- Ant --
     
    1229fi
    1330
    14 #-- Java --
    15 
    16 if [ "x$JAVA_HOME" = "x" ] ; then
    17 
    18   export JAVA_HOME=/research/local/jdk-64bit-1.7
    19 
    20   # Some other possible places that Java's SDK might be installed:
    21   #  export JAVA_HOME=/usr/lib/jvm/java-1.6.0
    22   #  export JAVA_HOME=/opt/openjdk-1.6.0
    23 
    24   export PATH=$JAVA_HOME/bin:$PATH
    25   echo "+ Setting JAVA_HOME to:"
    26   echo "+   $JAVA_HOME"
    27   echo "+ and updating PATH"
    28 fi
    29 
    3031#--
    3132# Assuming 'svn' is already on your path
Note: See TracChangeset for help on using the changeset viewer.