Fix to make PostImageScriptTest pass on Linux

Author: alexeysemenyukoracle

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

@@ -80,11 +80,15 @@ protected List<ToolValidator> getToolValidators() {
     }
 
     @Override
-    protected Path buildPackageBundle(Map<String, String> replacementData, BuildEnv env,
-            LinuxPackage pkg, Path outputParentDir) throws PackagerException, IOException {
-
+    protected void createConfigFiles(Map<String, String> replacementData,
+            BuildEnv env, LinuxPackage pkg) throws IOException {
         prepareProjectConfig(replacementData, env, pkg);
         adjustPermissionsRecursive(env.appImageDir());
+    }
+
+    @Override
+    protected Path buildPackageBundle(BuildEnv env, LinuxPackage pkg,
+            Path outputParentDir) throws PackagerException, IOException {
         return buildDeb(env, pkg, outputParentDir);
     }
 

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

@@ -107,18 +107,18 @@ public final Path execute(Map<String, ? super Object> params,
 
         LinuxPackagingPipeline.build()
                 .excludeDirFromCopying(outputParentDir)
+                .task(PackagingPipeline.PackageTaskID.CREATE_CONFIG_FILES)
+                        .packageAction(this::buildConfigFiles)
+                        .add()
                 .task(PackagingPipeline.PackageTaskID.CREATE_PACKAGE_FILE)
                         .packageAction(this::buildPackage)
                         .add()
-                .task(PackagingPipeline.PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
-                        .noaction() // FIXME: implement post-app-image script execution on Linux
-                        .add()
                 .create().execute(env, pkg, outputParentDir);
 
         return outputParentDir.resolve(pkg.packageFileNameWithSuffix()).toAbsolutePath();
     }
 
-    private void buildPackage(PackageBuildEnv<LinuxPackage, AppImageLayout> env) throws PackagerException, IOException {
+    private void buildConfigFiles(PackageBuildEnv<LinuxPackage, AppImageLayout> env) throws PackagerException, IOException {
         for (var ca : customActions) {
             ca.init(env.env(), env.pkg());
         }
@@ -131,8 +131,11 @@ private void buildPackage(PackageBuildEnv<LinuxPackage, AppImageLayout> env) thr
 
         data.putAll(createReplacementData(env.env(), env.pkg()));
 
-        Path packageBundle = buildPackageBundle(Collections.unmodifiableMap(
-                data), env.env(), env.pkg(), env.outputDir());
+        createConfigFiles(Collections.unmodifiableMap(data), env.env(), env.pkg());
+    }
+
+    private void buildPackage(PackageBuildEnv<LinuxPackage, AppImageLayout> env) throws PackagerException, IOException {
+        Path packageBundle = buildPackageBundle(env.env(), env.pkg(), env.outputDir());
 
         verifyOutputBundle(env.env(), env.pkg(), packageBundle).stream()
                 .filter(Objects::nonNull)
@@ -202,8 +205,11 @@ protected abstract void doValidate(BuildEnv env, LinuxPackage pkg)
     protected abstract Map<String, String> createReplacementData(
             BuildEnv env, LinuxPackage pkg) throws IOException;
 
-    protected abstract Path buildPackageBundle(
+    protected abstract void createConfigFiles(
             Map<String, String> replacementData,
+            BuildEnv env, LinuxPackage pkg) throws IOException;
+
+    protected abstract Path buildPackageBundle(
             BuildEnv env, LinuxPackage pkg, Path outputParentDir) throws
             PackagerException, IOException;
 

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

@@ -91,18 +91,20 @@ protected List<ToolValidator> getToolValidators() {
         return List.of(createRpmbuildToolValidator());
     }
 
-    @Override
-    protected Path buildPackageBundle(Map<String, String> replacementData, BuildEnv env,
-            LinuxPackage pkg, Path outputParentDir) throws PackagerException, IOException {
-
+    protected void createConfigFiles(Map<String, String> replacementData,
+            BuildEnv env, LinuxPackage pkg) throws IOException {
         Path specFile = specFile(env, pkg);
 
         // prepare spec file
         env.createResource(DEFAULT_SPEC_TEMPLATE)
                 .setCategory(I18N.getString("resource.rpm-spec-file"))
                 .setSubstitutionData(replacementData)
                 .saveToFile(specFile);
+    }
 
+    @Override
+    protected Path buildPackageBundle(BuildEnv env, LinuxPackage pkg,
+            Path outputParentDir) throws PackagerException, IOException {
         return buildRPM(env, pkg, outputParentDir);
     }