8371076: jpackage will wrongly overwrite the plist file in the embedded runtime when executed with the "--app-image" option

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java

@@ -24,10 +24,9 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.LinuxPackage;
-import jdk.jpackage.internal.model.LinuxLauncher;
-import jdk.jpackage.internal.model.Package;
-import jdk.jpackage.internal.model.Launcher;
+import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
+import static jdk.jpackage.internal.model.LauncherShortcut.toRequest;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -45,12 +44,14 @@
 import javax.imageio.ImageIO;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
-import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
 import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.model.LauncherShortcut;
+import jdk.jpackage.internal.model.LinuxLauncher;
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.util.CompositeProxy;
 import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.XmlUtils;
-import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 
 /**
  * Helper to create files for desktop integration.
@@ -65,7 +66,7 @@ final class DesktopIntegration extends ShellCustomAction {
     private static final List<String> REPLACEMENT_STRING_IDS = List.of(
             COMMANDS_INSTALL, COMMANDS_UNINSTALL, SCRIPTS, COMMON_SCRIPTS);
 
-    private DesktopIntegration(BuildEnv env, LinuxPackage pkg, LinuxLauncher launcher) throws IOException {
+    private DesktopIntegration(BuildEnv env, LinuxPackage pkg, LinuxLauncher launcher) {
 
         associations = launcher.fileAssociations().stream().map(
                 LinuxFileAssociation::create).toList();
@@ -77,20 +78,14 @@ private DesktopIntegration(BuildEnv env, LinuxPackage pkg, LinuxLauncher launche
         // Need desktop and icon files if one of conditions is met:
         //  - there are file associations configured
         //  - user explicitly requested to create a shortcut
-        boolean withDesktopFile = !associations.isEmpty() || launcher.shortcut().orElse(false);
-
-        var curIconResource = createLauncherIconResource(pkg.app(), launcher,
-                env::createResource);
+        boolean withDesktopFile = !associations.isEmpty() || toRequest(launcher.shortcut()).orElse(false);
 
-        if (curIconResource.isEmpty()) {
+        if (!launcher.hasIcon()) {
             // This is additional launcher with explicit `no icon` configuration.
             withDesktopFile = false;
-        } else {
-            final Path nullPath = null;
-            if (curIconResource.get().saveToFile(nullPath) != OverridableResource.Source.DefaultResource) {
-                // This launcher has custom icon configured.
-                withDesktopFile = true;
-            }
+        } else if (launcher.hasCustomIcon()) {
+            // This launcher has custom icon configured.
+            withDesktopFile = true;
         }
 
         desktopFileResource = env.createResource("template.desktop")
@@ -112,17 +107,12 @@ private DesktopIntegration(BuildEnv env, LinuxPackage pkg, LinuxLauncher launche
         if (withDesktopFile) {
             desktopFile = Optional.of(createDesktopFile(desktopFileName));
             iconFile = Optional.of(createDesktopFile(escapedAppFileName + ".png"));
-
-            if (curIconResource.isEmpty()) {
-                // Create default icon.
-                curIconResource = createLauncherIconResource(pkg.app(), pkg.app().mainLauncher().orElseThrow(), env::createResource);
-            }
         } else {
             desktopFile = Optional.empty();
             iconFile = Optional.empty();
         }
 
-        iconResource = curIconResource;
+        iconResource = createLauncherIconResource(launcher, env::createResource);
 
         desktopFileData = createDataForDesktopFile();
 
@@ -132,14 +122,14 @@ private DesktopIntegration(BuildEnv env, LinuxPackage pkg, LinuxLauncher launche
             nestedIntegrations = pkg.app().additionalLaunchers().stream().map(v -> {
                 return (LinuxLauncher)v;
             }).filter(l -> {
-                return l.shortcut().orElse(true);
-            }).map(toFunction(l -> {
+                return toRequest(l.shortcut()).orElse(true);
+            }).map(l -> {
                 return new DesktopIntegration(env, pkg, l);
-            })).toList();
+            }).toList();
         }
     }
 
-    static ShellCustomAction create(BuildEnv env, Package pkg) throws IOException {
+    static ShellCustomAction create(BuildEnv env, Package pkg) {
         if (pkg.isRuntimeInstaller()) {
             return ShellCustomAction.nop(REPLACEMENT_STRING_IDS);
         }
@@ -225,15 +215,34 @@ private List<String> requiredPackagesSelf() {
     }
 
     private Map<String, String> createDataForDesktopFile() {
+
+        var installedLayout = pkg.asInstalledPackageApplicationLayout().orElseThrow();
+
         Map<String, String> data = new HashMap<>();
         data.put("APPLICATION_NAME", launcher.name());
         data.put("APPLICATION_DESCRIPTION", launcher.description());
         data.put("APPLICATION_ICON", iconFile.map(
                 f -> f.installPath().toString()).orElse(null));
         data.put("DEPLOY_BUNDLE_CATEGORY", pkg.menuGroupName());
         data.put("APPLICATION_LAUNCHER", Enquoter.forPropertyValues().applyTo(
-                pkg.asInstalledPackageApplicationLayout().orElseThrow().launchersDirectory().resolve(
-                        launcher.executableNameWithSuffix()).toString()));
+                installedLayout.launchersDirectory().resolve(launcher.executableNameWithSuffix()).toString()));
+        data.put("STARTUP_DIRECTORY", launcher.shortcut()
+                .flatMap(LauncherShortcut::startupDirectory)
+                .map(startupDirectory -> {
+                    switch (startupDirectory) {
+                        case DEFAULT -> {
+                            return (Path)null;
+                        }
+                        case APP_DIR -> {
+                            return installedLayout.appDirectory();
+                        }
+                        default -> {
+                            throw new AssertionError();
+                        }
+                    }
+                }).map(str -> {
+                    return "Path=" + str;
+                }).orElse(null));
 
         return data;
     }
@@ -334,7 +343,7 @@ void applyTo(Map<String, String> data) {
      *  - installPath(): path where it should be installed by package manager;
      */
     private InstallableFile createDesktopFile(String fileName) {
-        var srcPath = pkg.asPackageApplicationLayout().orElseThrow().resolveAt(env.appImageDir()).desktopIntegrationDirectory().resolve(fileName);
+        var srcPath = env.asApplicationLayout().orElseThrow().desktopIntegrationDirectory().resolve(fileName);
         var installPath = pkg.asInstalledPackageApplicationLayout().orElseThrow().desktopIntegrationDirectory().resolve(fileName);
         return new InstallableFile(srcPath, installPath);
     }
@@ -481,7 +490,7 @@ private static int getIconSize(FileAssociation fa) {
 
     private final BuildEnv env;
     private final LinuxPackage pkg;
-    private final Launcher launcher;
+    private final LinuxLauncher launcher;
 
     private final List<LinuxFileAssociation> associations;
 

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java

@@ -25,13 +25,15 @@
 
 package jdk.jpackage.internal;
 
+import java.util.Optional;
+
 public class LinuxAppBundler extends AppImageBundler {
     public LinuxAppBundler() {
         setAppImageSupplier((params, output) -> {
             // Order is important!
             var app = LinuxFromParams.APPLICATION.fetchFrom(params);
             var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
-            LinuxPackagingPipeline.build()
+            LinuxPackagingPipeline.build(Optional.empty())
                     .excludeDirFromCopying(output.getParent())
                     .create().execute(BuildEnv.withAppImageDir(env, output), app);
         });

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayout.java

@@ -24,9 +24,10 @@
  */
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.util.PathUtils.resolveNullablePath;
+import static jdk.jpackage.internal.util.PathUtils.mapNullablePath;
 
 import java.nio.file.Path;
+import java.util.function.UnaryOperator;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.util.CompositeProxy;
 
@@ -40,7 +41,25 @@ static LinuxApplicationLayout create(ApplicationLayout layout, Path libAppLaunch
 
     @Override
     default LinuxApplicationLayout resolveAt(Path root) {
-        return create(ApplicationLayout.super.resolveAt(root),
-                resolveNullablePath(root, libAppLauncher()));
+        return (LinuxApplicationLayout)ApplicationLayout.super.resolveAt(root);
+    }
+
+    @Override
+    default LinuxApplicationLayout unresolve() {
+        return (LinuxApplicationLayout)ApplicationLayout.super.unresolve();
+    }
+
+    @Override
+    default LinuxApplicationLayout resetRootDirectory() {
+        if (isResolved()) {
+            return create(ApplicationLayout.super.resetRootDirectory(), libAppLauncher());
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    default LinuxApplicationLayout map(UnaryOperator<Path> mapper) {
+        return create(ApplicationLayout.super.map(mapper), mapNullablePath(mapper, libAppLauncher()));
     }
 }

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayoutMixin.java

@@ -26,7 +26,7 @@
 
 import java.nio.file.Path;
 
-// Must be publc to allow access from AppImageLayout.toPathGroup()
+// Must be public to allow access from AppImageLayout.toPathGroup()
 public interface LinuxApplicationLayoutMixin {
 
     /**