Changeset 15134

Show
Ignore:
Timestamp:
26.03.2008 16:29:16 (11 years ago)
Author:
oranfry
Message:

look for ant during gs3-setup instead of mucking around during installation

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/gs3-setup.sh

    r15131 r15134  
    6161 
    6262    ## adjustments to users (existing) environment ## 
     63 
     64    #PATH 
    6365    if [ `isinpath "$PATH" "$GSDL3SRCHOME/bin"` == "false" ]; then 
    6466        PATH=$GSDL3SRCHOME/bin/script:$GSDL3SRCHOME/bin:$PATH 
     
    7173    fi 
    7274 
     75    #CLASSPATH 
    7376    if [ `isinpath "$CLASSPATH" "$GSDL3HOME/WEB-INF/classes"` == "false" ]; then 
    7477        CLASSPATH=$GSDL3HOME/WEB-INF/classes:$GSDL3SRCHOME/resources/java:$CLASSPATH 
     
    9497    fi 
    9598 
     99    #LD_LIBRARY_PATH 
    96100    if [ `isinpath "$LD_LIBRARY_PATH" "$GSDL3SRCHOME/lib/jni"` == "false" ]; then 
    97101        LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GSDL3SRCHOME/lib/jni 
     
    103107        echo "  - LD_LIBRARY_PATH already correct" 
    104108    fi 
     109 
     110    #ant 
     111    which ant &> /dev/null 
     112    if [ "$?" != "0" ]; then 
     113            ANT_HOME=$GSDLSRCHOME/packages/ant 
     114            PATH=$ANT_HOME/bin:$PATH 
     115        echo "  - Setup ant" 
     116    else 
     117        echo "  - Ant already setup" 
     118    fi 
     119 
    105120    echo 
    106121}