Skip to content

Commit 642504b

Browse files
Add logic to ignore non-default install dir for DMG packager
1 parent c0fb452 commit 642504b

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import java.util.Objects;
3030
import java.util.Optional;
3131
import jdk.jpackage.internal.model.ConfigException;
32-
import jdk.jpackage.internal.model.MacDmgPackage;
3332
import jdk.jpackage.internal.model.MacApplication;
33+
import jdk.jpackage.internal.model.MacDmgPackage;
3434
import jdk.jpackage.internal.model.MacDmgPackageMixin;
3535
import jdk.jpackage.internal.model.MacPackage;
3636

@@ -55,6 +55,14 @@ List<Path> validatedDmgContent() {
5555
}
5656

5757
MacDmgPackage create() throws ConfigException {
58+
pkgBuilder.installDir().ifPresent(installDir -> {
59+
final var defaultInstallDirLocation = pkgBuilder.defaultInstallDir().map(Path::getParent).orElseThrow();
60+
if (!defaultInstallDirLocation.equals(installDir)) {
61+
Log.info(I18N.format("message.install-dir-ignored", defaultInstallDirLocation));
62+
pkgBuilder.installDir(defaultInstallDirLocation);
63+
}
64+
});
65+
5866
final var pkg = MacPackage.create(pkgBuilder.create());
5967

6068
return MacDmgPackage.create(pkg, new MacDmgPackageMixin.Stub(

0 commit comments

Comments
 (0)