Fixes to make PostImageScriptTest pass

Author: alexeysemenyukoracle

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

@@ -107,6 +107,8 @@ static PackagingPipeline.Builder build(Optional<Package> pkg) {
                     return new TaskContextProxy(appContext, false, isRuntimeInstaller || withPredefinedAppImage);
                 })
                 .appImageLayoutForPackaging(MacPackagingPipeline::packagingLayout)
+                .task(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .packageAction(MacPackagingPipeline::runPostAppImageUserScript).add()
                 .task(CopyAppImageTaskID.COPY)
                         .copyAction(MacPackagingPipeline::copyAppImage).add()
                 .task(MacBuildApplicationTaskID.RUNTIME_INFO_PLIST)
@@ -217,6 +219,12 @@ private static void copyJliLib(
         }
     }
 
+    private static void runPostAppImageUserScript(PackageBuildEnv<Package, AppImageLayout> env) throws IOException {
+        PackagingPipeline.runPostAppImageUserScript(new PackageBuildEnv<>(
+                BuildEnv.withAppImageDir(env.env(), env.env().appImageDir().resolve(env.envLayout().rootDirectory())),
+                env.pkg(), env.pkg().appImageLayout(), env.outputDir()));
+    }
+
     private static void writePackageFile(PackageBuildEnv<Package, ApplicationLayout> env) throws IOException {
         new PackageFile(env.pkg().packageName()).save(env.resolvedLayout());
     }

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

@@ -235,12 +235,15 @@ private void applyToPipeline(PackagingPipeline.Builder pipelineBuilder) {
                 .excludeDirFromCopying(outputDir)
                 .task(PkgPackageTaskID.PREPARE_MAIN_SCRIPTS)
                         .action(this::prepareMainScripts)
+                        .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
                         .add()
                 .task(PkgPackageTaskID.CREATE_DISTRIBUTION_XML_FILE)
                         .action(this::prepareDistributionXMLFile)
+                        .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
                         .add()
                 .task(PkgPackageTaskID.CREATE_COMPONENT_PLIST_FILE)
                         .action(this::createComponentPlistFile)
+                        .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
                         .add()
                 .task(PackageTaskID.CREATE_CONFIG_FILES)
                         .action(this::prepareConfigFiles)
@@ -252,18 +255,19 @@ private void applyToPipeline(PackagingPipeline.Builder pipelineBuilder) {
                         .add()
                 .task(PkgPackageTaskID.PREPARE_SERVICES)
                         .action(this::prepareServicesForBkgbuild)
+                        .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
                         .add()
                 .task(InternalPackageType.SERVICES)
-                        .addDependencies(PkgPackageTaskID.PREPARE_SERVICES)
                         .action(this::buildServicesPKG)
+                        .addDependencies(PkgPackageTaskID.PREPARE_SERVICES, PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
                         .add()
                 .task(InternalPackageType.SUPPORT)
-                        .addDependencies(PkgPackageTaskID.PREPARE_SERVICES)
                         .action(this::buildSupportPKG)
+                        .addDependencies(PkgPackageTaskID.PREPARE_SERVICES, PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
                         .add()
                 .task(InternalPackageType.MAIN)
                         .action(this::buildMainPKG)
-                        .addDependencies(PkgPackageTaskID.PREPARE_MAIN_SCRIPTS)
+                        .addDependencies(PkgPackageTaskID.PREPARE_MAIN_SCRIPTS, PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
                         .add();
 
         final List<TaskID> disabledTasks = new ArrayList<>();