AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #99 from tschulte/issue-94

Browse Source 
make ucode with pack.gz work again
This commit is contained in:
Michael Bayne
2018-05-11 18:30:13 -07:00
committed by GitHub
parent 5a3e1d71bd 8d57dfe1e4
commit 5917ce9329
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/getdown/data/Resource.java
+2 -1
View File
@@ -334,7 +334,8 @@ public class Resource implements Comparable<Resource>
protected static boolean isPacked200Jar (String path) protected static boolean isPacked200Jar (String path)
{ {
return path.endsWith(".jar.pack") || path.endsWith(".jar.pack.gz"); return path.endsWith(".jar.pack") || path.endsWith(".jar.pack_new") ||
path.endsWith(".jar.pack.gz")|| path.endsWith(".jar.pack.gz_new");
} }
protected String _path; protected String _path;
src/main/java/com/threerings/getdown/util/FileUtil.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class FileUtil
extractedJarFileOut = new FileOutputStream(target); extractedJarFileOut = new FileOutputStream(target);
jarOutputStream = new JarOutputStream(extractedJarFileOut); jarOutputStream = new JarOutputStream(extractedJarFileOut);
packedJarIn = new FileInputStream(packedJar); packedJarIn = new FileInputStream(packedJar);
if (packedJar.getName().endsWith(".gz")) { if (packedJar.getName().endsWith(".gz") || packedJar.getName().endsWith(".gz_new")) {
packedJarIn = new GZIPInputStream(packedJarIn); packedJarIn = new GZIPInputStream(packedJarIn);
} }
Pack200.Unpacker unpacker = Pack200.newUnpacker(); Pack200.Unpacker unpacker = Pack200.newUnpacker();