Changeset 23210 for main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java

Timestamp:

2010-10-26T15:12:23+13:00 (14 years ago)

Author:

sjm84

Message:

The uninstaller has been modified so that it no longer will delete files or folders in the top-level directory that do not belong to Greenstone

File:

• main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java (modified) (4 diffs)

main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java

@@ -44 +44 @@
     public static final ResourceBundle bundle = ResourceBundle.getBundle("resources.LanguagePack");
 
-    public static final File gs2InstallProps = new File("etc/installation.properties");
-    public static final File gs3InstallProps = new File("installation.properties");
+    public static final File gs2InstallProps = new File("../etc/installation.properties");
+    public static final File gs3InstallProps = new File("../installation.properties");
 
     boolean keepCollections = true;
@@ -335 +335 @@
 
             //never delete the things we are currently running
-            exceptions.add( new File("bin/search4j.exe") );
-            exceptions.add( new File("bin/search4j") );
-
-            exceptions.add( new File("bin/windows/search4j.exe") );
-            exceptions.add( new File("bin/linux/search4j") );
-            exceptions.add( new File("bin/darwin/search4j") );
-
-            exceptions.add( new File("packages/jre") );
-            exceptions.add( new File("uninst.jar") );
-            exceptions.add( new File("Uninstall.bat") );
-            exceptions.add( new File("Uninstall.sh") );
+            exceptions.add( new File("../bin/search4j.exe") );
+            exceptions.add( new File("../bin/search4j") );
+
+            exceptions.add( new File("../bin/windows/search4j.exe") );
+            exceptions.add( new File("../bin/linux/search4j") );
+            exceptions.add( new File("../bin/darwin/search4j") );
+
+            exceptions.add( new File("../packages/jre") );
+            exceptions.add( new File("../uninstall") );
 
             if ( keepCollections ) {
-                exceptions.add( new File("web/sites/localsite/collect") );
-                exceptions.add( new File("collect") );
+                exceptions.add( new File("../web/sites/localsite/collect") );
+                exceptions.add( new File("../collect") );
             }
 
@@ -366 +364 @@
             }
             
-            recursiveDelete( cd , ex );
+            //recursiveDelete( cd , ex );
+            selectiveDelete ( cd, ex );
         } catch ( CancelledException ce ) {
             log( bundle.getString("uninstaller.cancelled") + "\n" );
@@ -436 +435 @@
         return null;
 
+    }
+    
+    public void selectiveDelete( File f, File[] exceptions ) throws CancelledException {
+        
+        File[] files = (new File(".")).listFiles();
+        
+        for ( int i=0; i < files.length; i++) {
+            if( files[i].getAbsolutePath().endsWith(".uninstall") ) {
+                String[] paths = getRelevantPathsFromUninstallFile(files[i]);
+                
+                for(int j=0; j < paths.length; j++) {
+                    recursiveDelete( new File(".." + File.separator + paths[j]), exceptions );
+                }
+            }
+        }
+    }
+    
+    public String[] getRelevantPathsFromUninstallFile ( File uninstallFile ) {
+        
+        ArrayList paths = new ArrayList();
+        try {
+            BufferedReader in = new BufferedReader(new FileReader(uninstallFile));
+            
+            String line;
+            while ( (line = in.readLine()) != null ) {
+                int separatorIndex = line.indexOf(File.separator);
+                
+                if ( separatorIndex == -1 && line.length() > 0 && !paths.contains(line)) {
+                    paths.add(line);
+                }
+                else if ( separatorIndex > -1 && line.length() > 0) {
+                    String path = line.substring(0, separatorIndex);
+                    if ( !paths.contains(path) ) {
+                        paths.add(path);
+                    }
+                }
+            }
+            
+            in.close();
+        }
+        catch( Exception ex ) {
+            ex.printStackTrace();
+            return null;
+        }
+        return (String[]) paths.toArray(new String[0]);
     }