Changeset 17808

Timestamp:

2008-11-11T14:43:14+13:00 (15 years ago)

Author:

oranfry

Message:

uninstaller fixes

Location:

release-kits/shared/uninstaller

Files:

• Uninstall.sh (modified) (3 diffs)
• gsdl-template/setup.bash (added)

release-kits/shared/uninstaller/Uninstall.sh

@@ -1 +1 @@
 if [ -f "setup.bash" ]; then
-#This is Greenstone 2
+    #This is Greenstone 2
     . ./setup.bash > /dev/null
     SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
-else
-#This is Greenstone 3
+
+elif [ -f "gs2build/setup.bash" ]; then
+    #This is Greenstone 3
     . ./gs2build/setup.bash > /dev/null
     SEARCH4J_EXECUTABLE=./bin/search4j
+
+else
+    echo "Couldn't find setup.bash. This copy of Greenstone appears to be corrupt."
+    echo "To manually uninstall, please delete the entire Greenstone home folder."
+    exit
 fi
 
@@ -17 +23 @@
 if [ -e "uninst.flag" ]; then
 
-    rm -rf packages/jre
-    rmdir packages
+    rm -rf packages/jre &> /dev/null
+    rmdir packages &> /dev/null
     
-    rm -rf bin
+    rm -rf bin &> /dev/null
         
-    rm uninst.jar
-    rm uninst.flag
-    rm Uninstall.*
+    rm uninst.jar &> /dev/null
+    rm uninst.flag &> /dev/null
+    rm Uninstall.* &> /dev/null
     
     CONTENTS=`ls`
@@ -30 +36 @@
         GSDEL=`pwd`
         cd ..
-        rmdir $GSDEL
+        rmdir $GSDEL &> /dev/null
     fi
 fi