Changeset 23257 for main/trunk/release-kits/shared
- Timestamp:
- 2010-11-01T10:49:32+13:00 (13 years ago)
- Location:
- main/trunk/release-kits/shared/core/uninstaller
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/shared/core/uninstaller/Uninstall.sh
r23247 r23257 1 if [ -f "../setup.bash" ]; then 1 cd .. 2 if [ -f "setup.bash" ]; then 2 3 #This is Greenstone 2 3 . . ./setup.bash > /dev/null4 . ./setup.bash > /dev/null 4 5 SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j 5 6 6 elif [ -f " ../gs2build/setup.bash" ]; then7 elif [ -f "gs2build/setup.bash" ]; then 7 8 #This is Greenstone 3 8 . . ./gs2build/setup.bash > /dev/null9 SEARCH4J_EXECUTABLE=. ./bin/search4j9 . ./gs2build/setup.bash > /dev/null 10 SEARCH4J_EXECUTABLE=./bin/search4j 10 11 11 12 else … … 15 16 fi 16 17 17 if [ $GSDLOS = linux]; then18 "$SEARCH4J_EXECUTABLE" -p . ./packages/jre -l ./uninst.jar19 elif [ $GSDLOS = darwin]; then20 "$SEARCH4J_EXECUTABLE" -p /System/Library/Frameworks/JavaVM.framework/Home -l ./uninst .jar18 if [ "$GSDLOS" = "linux" ]; then 19 "$SEARCH4J_EXECUTABLE" -p ./packages/jre -l ./uninstall/uninst.jar 20 elif [ "$GSDLOS" = "darwin" ]; then 21 "$SEARCH4J_EXECUTABLE" -p /System/Library/Frameworks/JavaVM.framework/Home -l ./uninstall/uninst.jar 21 22 fi 22 23 23 24 if [ -e "uninst.flag" ]; then 24 25 25 rm -rf ../packages/jre &> /dev/null26 rmdir ../packages &> /dev/null26 rm -rf packages/jre &> /dev/null 27 rmdir packages &> /dev/null 27 28 28 rm -rf ../bin &> /dev/null29 rm -rf ../tmp &> /dev/null30 rm -rf ../uninstall &> /dev/null29 rm -rf bin &> /dev/null 30 rm -rf tmp &> /dev/null 31 rm -rf uninstall &> /dev/null 31 32 32 if [ -e " ../llssite.cfg" ] ; then33 rm ../llssite.cfg &> /dev/null33 if [ -e "llssite.cfg" ] ; then 34 rm llssite.cfg &> /dev/null 34 35 fi 35 36 36 if [ -e " ../glisite.cfg" ] ; then37 rm ../glisite.cfg &> /dev/null37 if [ -e "glisite.cfg" ] ; then 38 rm glisite.cfg &> /dev/null 38 39 fi 39 40 40 cd ..41 41 CONTENTS=`ls` 42 42 if [ -z "$CONTENTS" ]; then -
main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java
r23242 r23257 44 44 public static final ResourceBundle bundle = ResourceBundle.getBundle("resources.LanguagePack"); 45 45 46 public static final File gs2InstallProps = new File(" ../etc/installation.properties");47 public static final File gs3InstallProps = new File(" ../installation.properties");46 public static final File gs2InstallProps = new File("etc/installation.properties"); 47 public static final File gs3InstallProps = new File("installation.properties"); 48 48 49 49 boolean keepCollections = true; … … 335 335 336 336 //never delete the things we are currently running 337 exceptions.add( new File(" ../bin/search4j.exe") );338 exceptions.add( new File(" ../bin/search4j") );339 340 exceptions.add( new File(" ../bin/windows/search4j.exe") );341 exceptions.add( new File(" ../bin/linux/search4j") );342 exceptions.add( new File(" ../bin/darwin/search4j") );343 344 exceptions.add( new File(" ../packages/jre") );345 exceptions.add( new File(" ../uninstall") );337 exceptions.add( new File("bin/search4j.exe") ); 338 exceptions.add( new File("bin/search4j") ); 339 340 exceptions.add( new File("bin/windows/search4j.exe") ); 341 exceptions.add( new File("bin/linux/search4j") ); 342 exceptions.add( new File("bin/darwin/search4j") ); 343 344 exceptions.add( new File("packages/jre") ); 345 exceptions.add( new File("uninstall") ); 346 346 347 347 if ( keepCollections ) { 348 exceptions.add( new File(" ../web/sites/localsite/collect") );349 exceptions.add( new File(" ../collect") );348 exceptions.add( new File("web/sites/localsite/collect") ); 349 exceptions.add( new File("collect") ); 350 350 } 351 351 … … 446 446 447 447 for(int j=0; j < paths.length; j++) { 448 recursiveDelete( new File( ".." + File.separator +paths[j]), exceptions );448 recursiveDelete( new File(paths[j]), exceptions ); 449 449 } 450 450 }
Note:
See TracChangeset
for help on using the changeset viewer.