Changeset 17794 for release-kits/shared

Timestamp:

2008-11-07T17:23:25+13:00 (15 years ago)

Author:

max

Message:

Fixed some bugs for the Uninstaller on the darwin platform and with Greenstone3.

File:

• release-kits/shared/uninstaller/Uninstall.sh (modified) (1 diff)

release-kits/shared/uninstaller/Uninstall.sh

@@ -1 +1 @@
 if [ -f "setup.bash" ]; then
-. ./setup.bash > /dev/null
-SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
+#This is Greenstone 2
+    . ./setup.bash > /dev/null
+    SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
 else
-SEARCH4J_EXECUTABLE=./bin/search4j
+#This is Greenstone 3
+    . ./gs2build/setup.bash > /dev/null
+    SEARCH4J_EXECUTABLE=./bin/search4j
 fi
 
-"$SEARCH4J_EXECUTABLE" -p ./packages/jre -l ./uninst.jar
+if [ $GSDLOS = linux ]; then
+    "$SEARCH4J_EXECUTABLE" -p ./packages/jre -l ./uninst.jar
+elif [ $GSDLOS = darwin ]; then
+    "$SEARCH4J_EXECUTABLE" -p /System/Library/Frameworks/JavaVM.framework/Home -l ./uninst.jar
+fi
 
 if [ -e "uninst.flag" ]; then