lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #1852: Lookup manifest in this jar (#1853)

Browse Source
This commit is contained in:
Glavo
2022-11-23 14:06:35 +08:00
committed by GitHub
parent 73b938cfd9
commit 1253272626
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/JarUtils.java
View File

@@ -18,7 +18,6 @@
package org.jackhuang.hmcl.util.io; package org.jackhuang.hmcl.util.io;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.file.FileSystemNotFoundException; import java.nio.file.FileSystemNotFoundException;
import java.nio.file.Files; import java.nio.file.Files;
@@ -48,19 +47,7 @@ public final class JarUtils {
}) })
.filter(Files::isRegularFile); .filter(Files::isRegularFile);
Manifest mf = null; manifest = THIS_JAR.flatMap(JarUtils::getManifest).orElseGet(Manifest::new);
try (InputStream input = JarUtils.class.getResourceAsStream("/META-INF/MANIFEST.MF")) {
if (input != null)
mf = new Manifest(input);
} catch (IOException e) {
// Logger has not started
e.printStackTrace();
}
if (mf == null)
mf = THIS_JAR.flatMap(JarUtils::getManifest).orElseGet(Manifest::new);
manifest = mf;
} }
public static Optional<Path> thisJar() { public static Optional<Path> thisJar() {