Ignore:
Timestamp:
2010-11-01T10:49:32+13:00 (13 years ago)
Author:
sjm84
Message:

More uninstaller modifications

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/shared/core/uninstaller/Uninstall.sh

    r23247 r23257  
    1 if [ -f "../setup.bash" ]; then
     1cd ..
     2if [ -f "setup.bash" ]; then
    23    #This is Greenstone 2
    3     . ../setup.bash > /dev/null
     4    . ./setup.bash > /dev/null
    45    SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
    56
    6 elif [ -f "../gs2build/setup.bash" ]; then
     7elif [ -f "gs2build/setup.bash" ]; then
    78    #This is Greenstone 3
    8     . ../gs2build/setup.bash > /dev/null
    9     SEARCH4J_EXECUTABLE=../bin/search4j
     9    . ./gs2build/setup.bash > /dev/null
     10    SEARCH4J_EXECUTABLE=./bin/search4j
    1011
    1112else
    … …  
    1516fi
    1617
    17 if [ $GSDLOS = linux ]; then
    18     "$SEARCH4J_EXECUTABLE" -p ../packages/jre -l ./uninst.jar
    19 elif [ $GSDLOS = darwin ]; then
    20     "$SEARCH4J_EXECUTABLE" -p /System/Library/Frameworks/JavaVM.framework/Home -l ./uninst.jar
     18if [ "$GSDLOS" = "linux" ]; then
     19    "$SEARCH4J_EXECUTABLE" -p ./packages/jre -l ./uninstall/uninst.jar
     20elif [ "$GSDLOS" = "darwin" ]; then
     21    "$SEARCH4J_EXECUTABLE" -p /System/Library/Frameworks/JavaVM.framework/Home -l ./uninstall/uninst.jar
    2122fi
    2223
    2324if [ -e "uninst.flag" ]; then
    2425
    25     rm -rf ../packages/jre &> /dev/null
    26     rmdir ../packages &> /dev/null
     26    rm -rf packages/jre &> /dev/null
     27    rmdir packages &> /dev/null
    2728   
    28     rm -rf ../bin &> /dev/null
    29     rm -rf ../tmp &> /dev/null
    30     rm -rf ../uninstall &> /dev/null
     29    rm -rf bin &> /dev/null
     30    rm -rf tmp &> /dev/null
     31    rm -rf uninstall &> /dev/null
    3132
    32     if [ -e "../llssite.cfg" ] ; then
    33         rm ../llssite.cfg &> /dev/null
     33    if [ -e "llssite.cfg" ] ; then
     34        rm llssite.cfg &> /dev/null
    3435    fi
    3536
    36     if [ -e "../glisite.cfg" ] ; then
    37         rm ../glisite.cfg &> /dev/null
     37    if [ -e "glisite.cfg" ] ; then
     38        rm glisite.cfg &> /dev/null
    3839    fi
    3940   
    40     cd ..
    4141    CONTENTS=`ls`
    4242    if [ -z "$CONTENTS" ]; then
Note: See TracChangeset for help on using the changeset viewer.