Skip to content

Commit 97912f8

Browse files
Fix AppImageSigner: launchers should be signed
1 parent c9ef927 commit 97912f8

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
package jdk.jpackage.internal;
2626

2727
import static java.util.stream.Collectors.joining;
28-
import static java.util.stream.Collectors.toSet;
2928
import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
3029

3130
import java.io.IOException;
@@ -42,8 +41,6 @@
4241
import java.util.stream.Stream;
4342
import jdk.jpackage.internal.Codesign.CodesignException;
4443
import jdk.jpackage.internal.model.Application;
45-
import jdk.jpackage.internal.model.ApplicationLayout;
46-
import jdk.jpackage.internal.model.Launcher;
4744
import jdk.jpackage.internal.model.MacApplication;
4845
import jdk.jpackage.internal.util.PathUtils;
4946
import jdk.jpackage.internal.util.function.ExceptionBox;
@@ -76,12 +73,6 @@ static final class SignFilter implements Predicate<Path> {
7673

7774
SignFilter(Application app, Path appImage) {
7875
Objects.requireNonNull(appImage);
79-
80-
launchers = app.asApplicationLayout().map(appLayout -> {
81-
return appLayout.resolveAt(appImage);
82-
}).map(ApplicationLayout::launchersDirectory).map(launchersDir -> {
83-
return app.launchers().stream().map(Launcher::executableNameWithSuffix).map(launchersDir::resolve).collect(toSet());
84-
}).orElseGet(Set::of);
8576
}
8677

8778
@Override
@@ -91,7 +82,7 @@ public boolean test(Path path) {
9182
}
9283

9384
if (Files.isExecutable(path) || path.getFileName().toString().endsWith(".dylib")) {
94-
if (path.toString().contains("dylib.dSYM/Contents") || launchers.contains(path)) {
85+
if (path.toString().contains("dylib.dSYM/Contents")) {
9586
return false;
9687
}
9788

@@ -100,8 +91,6 @@ public boolean test(Path path) {
10091

10192
return false;
10293
}
103-
104-
private final Set<Path> launchers;
10594
}
10695

10796
private void sign(MacApplication app, Path appImage) throws CodesignException, IOException {

0 commit comments

Comments
 (0)