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

Timestamp:

2010-11-01T10:49:32+13:00 (13 years ago)

Author:

sjm84

Message:

More uninstaller modifications

File:

• main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java (modified) (3 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("../uninstall") );
+            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") );
             }
 
@@ -446 +446 @@
                 
                 for(int j=0; j < paths.length; j++) {
-                    recursiveDelete( new File(".." + File.separator + paths[j]), exceptions );
+                    recursiveDelete( new File(paths[j]), exceptions );
                 }
             }