File tree Expand file tree Collapse file tree 1 file changed +9
-1
lines changed
src/jdk.jpackage/macosx/classes/jdk/jpackage/internal Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Original file line number Diff line number Diff line change 29
29
import java .util .Objects ;
30
30
import java .util .Optional ;
31
31
import jdk .jpackage .internal .model .ConfigException ;
32
- import jdk .jpackage .internal .model .MacDmgPackage ;
33
32
import jdk .jpackage .internal .model .MacApplication ;
33
+ import jdk .jpackage .internal .model .MacDmgPackage ;
34
34
import jdk .jpackage .internal .model .MacDmgPackageMixin ;
35
35
import jdk .jpackage .internal .model .MacPackage ;
36
36
@@ -55,6 +55,14 @@ List<Path> validatedDmgContent() {
55
55
}
56
56
57
57
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
+
58
66
final var pkg = MacPackage .create (pkgBuilder .create ());
59
67
60
68
return MacDmgPackage .create (pkg , new MacDmgPackageMixin .Stub (
You can’t perform that action at this time.
0 commit comments