Changeset 17435 for release-kits

Timestamp:

2008-10-01T16:46:57+13:00 (16 years ago)

Author:

oranfry

Message:

got the uninstaller working

Location:

release-kits/shared/uninstaller

Files:

• Uninstall.bat (modified) (1 diff)
• Uninstaller.java (modified) (3 diffs)

release-kits/shared/uninstaller/Uninstall.bat

@@ -14 +14 @@
     rm uninst.flag
     rm Uninstall.bat
+    
+    if NOT EXIST *.* (
+        set GSDEL=%CD%
+        cd ..
+        rmdir %GSDEL%
+    )
+    
 )

release-kits/shared/uninstaller/Uninstaller.java

@@ -20 +20 @@
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
+import java.util.ArrayList;
 
 public class Uninstaller {
@@ -255 +256 @@
         //delete the files
         try {
-            ArrayList<File> exceptions = new ArrayList<File>();
+            ArrayList exceptions = new ArrayList();
 
             //never delete the things we are currently running
-            exceptions.add( "bin/search4j.exe" );
-            exceptions.add( "packages/jre" );
-            exceptions.add( "uninst.jar" );
-            exceptions.add( "Uninstall.bat" );
-            exceptions.add( "Uninstall.sh" );
+            exceptions.add( new File("bin/search4j.exe") );
+            exceptions.add( new File("packages/jre") );
+            exceptions.add( new File("uninst.jar") );
+            exceptions.add( new File("Uninstall.bat") );
+            exceptions.add( new File("Uninstall.sh") );
 
             if ( keepCollections ) {
@@ -277 +278 @@
                 System.exit(0);
             }
-            recursiveDelete( cd , exceptions.toArray() );
+            
+            File[] ex = new File[exceptions.size()];
+            for ( int i=0; i<exceptions.size(); i++ ) {
+                ex[i] = (File)exceptions.get(i);
+            }
+            
+            recursiveDelete( cd , ex );
         } catch ( CancelledException ce ) {
             log.append( bundle.getString("cancelled") + "\n" );