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

*** 120,134 ****
      }
  
      // it is static for the sake of sharing with "installer" bundlers
      // that may skip calls to validate/bundle in this class!
      public static File getRootDir(File outDir, Map<String, ? super Object> p) {
!         return new File(outDir, APP_FS_NAME.fetchFrom(p));
      }
  
      public static String getLauncherCfgName(Map<String, ? super Object> p) {
!         return "app/" + APP_FS_NAME.fetchFrom(p) +".cfg";
      }
  
      File doBundle(Map<String, ? super Object> p, File outputDirectory,
              boolean dependentTask) {
          if (Arguments.CREATE_JRE_INSTALLER.fetchFrom(p)) {
--- 120,134 ----
      }
  
      // it is static for the sake of sharing with "installer" bundlers
      // that may skip calls to validate/bundle in this class!
      public static File getRootDir(File outDir, Map<String, ? super Object> p) {
!         return new File(outDir, APP_NAME.fetchFrom(p));
      }
  
      public static String getLauncherCfgName(Map<String, ? super Object> p) {
!         return "app/" + APP_NAME.fetchFrom(p) +".cfg";
      }
  
      File doBundle(Map<String, ? super Object> p, File outputDirectory,
              boolean dependentTask) {
          if (Arguments.CREATE_JRE_INSTALLER.fetchFrom(p)) {
*** 140,150 ****
  
      private File doJreBundle(Map<String, ? super Object> p,
              File outputDirectory, boolean dependentTask) {
          try {
              File rootDirectory = createRoot(p, outputDirectory, dependentTask,
!                     APP_FS_NAME.fetchFrom(p), "linuxapp-image-builder");
              AbstractAppImageBuilder appBuilder = new LinuxAppImageBuilder(
                      APP_NAME.fetchFrom(p), outputDirectory.toPath());
              File predefined = PREDEFINED_RUNTIME_IMAGE.fetchFrom(p);
              if (predefined == null ) {
                  JLinkBundlerHelper.generateJre(p, appBuilder);
--- 140,150 ----
  
      private File doJreBundle(Map<String, ? super Object> p,
              File outputDirectory, boolean dependentTask) {
          try {
              File rootDirectory = createRoot(p, outputDirectory, dependentTask,
!                     APP_NAME.fetchFrom(p), "linuxapp-image-builder");
              AbstractAppImageBuilder appBuilder = new LinuxAppImageBuilder(
                      APP_NAME.fetchFrom(p), outputDirectory.toPath());
              File predefined = PREDEFINED_RUNTIME_IMAGE.fetchFrom(p);
              if (predefined == null ) {
                  JLinkBundlerHelper.generateJre(p, appBuilder);
*** 161,171 ****
  
      private File doAppBundle(Map<String, ? super Object> p,
              File outputDirectory, boolean dependentTask) {
          try {
              File rootDirectory = createRoot(p, outputDirectory, dependentTask,
!                     APP_FS_NAME.fetchFrom(p), "linuxapp-image-builder");
              AbstractAppImageBuilder appBuilder = new LinuxAppImageBuilder(p,
                      outputDirectory.toPath());
              if (PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null ) {
                  JLinkBundlerHelper.execute(p, appBuilder);
              } else {
--- 161,171 ----
  
      private File doAppBundle(Map<String, ? super Object> p,
              File outputDirectory, boolean dependentTask) {
          try {
              File rootDirectory = createRoot(p, outputDirectory, dependentTask,
!                     APP_NAME.fetchFrom(p), "linuxapp-image-builder");
              AbstractAppImageBuilder appBuilder = new LinuxAppImageBuilder(p,
                      outputDirectory.toPath());
              if (PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null ) {
                  JLinkBundlerHelper.execute(p, appBuilder);
              } else {