Changeset 17897 for release-kits/shared/ant-installer/src/org/tp23/antinstaller/selfextract/SelfExtractor.java

Timestamp:

2008-11-20T10:51:46+13:00 (15 years ago)

Author:

oranfry

Message:

a patched ant-installer which can handle being run in paths with foreign characters

File:

• release-kits/shared/ant-installer/src/org/tp23/antinstaller/selfextract/SelfExtractor.java (modified) (1 diff)

release-kits/shared/ant-installer/src/org/tp23/antinstaller/selfextract/SelfExtractor.java

@@ -73 +73 @@
         //String fileForm = jarUrl.getFile();
 
+
+/*
+        File file = new File( fileForm );
+        if ( !file.exists() ) {
+            throw new RuntimeException( "Failed expanding Jar.\n File: '" + file.getAbsolutePath() + "'\nString: '" + stringForm + "'" );
+        }
+        return file;
+*/
+
         File file = null;
         int endIdx = stringForm.indexOf("!/");
-        if(endIdx != -1){
-            String unescaped = null;
-            String fileNamePart = stringForm.substring("jar:file:".length(), endIdx);
-            file = new File(fileNamePart);
-            if ( ! file.exists()) {
-                // try to unescape encase the URL Handler has escaped the " " to %20
-                unescaped = unescape(fileNamePart);
-                file = new File(unescaped);
-            }
-            return file;
-        }
-        throw new RuntimeException("Failed expanding Jar.");
+        if( endIdx == -1 ) {
+            throw new RuntimeException("Failed expanding Jar.");
+        }
+        String unescaped = null;
+        String fileNamePart = stringForm.substring("jar:file:".length(), endIdx);
+        file = new File(fileNamePart);
+        file = new File( file.getName() );
+
+/*
+        if ( !file.exists()) {
+            // try to unescape encase the URL Handler has escaped the " " to %20
+            unescaped = unescape(fileNamePart);
+            file = new File(unescaped);
+        }
+*/
+        return file;
+
     }