Changeset 782 for java

Timestamp:

Apr 3, 2013, 2:15:54 AM (12 years ago)

Author:

alloc

Message:

AEI2.00:

• Fix unpacking - executable bit

Location:

java

Files:

• _ThirdPartyLibs/commons-compress-1.5.jar (added)
• _ThirdPartyLibs/xz-1.2.jar (added)
• installer2/.classpath (modified) (1 diff)
• installer2/src/net/oni2/aeinstaller/backend/packages/unpack/Unpacker.java (modified) (4 diffs)

java/installer2/.classpath

@@ -27 +27 @@
         <classpathentry combineaccessrules="false" kind="src" path="/HTTPFileDownloader"/>
         <classpathentry combineaccessrules="false" kind="src" path="/ModDepotAccess"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/commons-compress-1.5.jar"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/xz-1.2.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

java/installer2/src/net/oni2/aeinstaller/backend/packages/unpack/Unpacker.java

@@ -6 +6 @@
 import java.io.InputStream;
 import java.util.Enumeration;
-import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
 
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.io.FileUtils;
 
@@ -124 +124 @@
                                                 target.mkdirs();
 
-                                                for (Enumeration<? extends ZipEntry> e = zf.entries(); e
+                                                for (Enumeration<? extends ZipArchiveEntry> e = zf.getEntries(); e
                                                                 .hasMoreElements();) {
-                                                        ZipEntry ze = e.nextElement();
+                                                        ZipArchiveEntry ze = e.nextElement();
                                                         if (ze.getName().toLowerCase()
                                                                         .endsWith("/mod_info.cfg")
@@ -138 +138 @@
                                                 }
 
-                                                for (Enumeration<? extends ZipEntry> e = zf.entries(); e
+                                                for (Enumeration<? extends ZipArchiveEntry> e = zf.getEntries(); e
                                                                 .hasMoreElements();) {
                                                         if (state == EState.INTERRUPTED)
                                                                 return;
-                                                        ZipEntry ze = e.nextElement();
+                                                        ZipArchiveEntry ze = e.nextElement();
                                                         if (!ze.isDirectory()) {
                                                                 if (ze.getName().startsWith(pathStartName)) {
@@ -163 +163 @@
                                                                                 }
                                                                                 fileOut.close();
+                                                                                
+                                                                                if ((ze.getUnixMode() & 0x0111) != 0)
+                                                                                        targetFile.setExecutable(true);
                                                                         }
                                                                 }