From 7a8aacf0a93399f04d741015ce2d9ade8b7d134e Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Thu, 14 Mar 2019 16:37:00 +0300 Subject: [PATCH] updater: do not skip create optional actions for jre64 if patch apply to installation bundled jre64 patch script: put updater log in artifacts IDEA-208331 Patch script does not correctly prepare patches with files like *.1 --- updater/src/com/intellij/updater/Patch.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/updater/src/com/intellij/updater/Patch.java b/updater/src/com/intellij/updater/Patch.java index 1cdf11b11d24..7497c0854228 100644 --- a/updater/src/com/intellij/updater/Patch.java +++ b/updater/src/com/intellij/updater/Patch.java @@ -362,9 +362,13 @@ public class Patch { return new PatchFileCreator.ApplicationResult(false, appliedActions, t); } + File jre64 = new File(toDir.getAbsolutePath() + "/jre64"); for (File directory : createdDirectories) { File[] children = directory.listFiles(); - if (children != null && createdOptionalFiles.containsAll(Arrays.asList(children))) { + if (children != null && + (!directory.getAbsolutePath().contains("jre64") || + directory.getAbsolutePath().contains("jre64") && !jre64.exists()) && + createdOptionalFiles.containsAll(Arrays.asList(children))) { Runner.logger().info("Pruning empty directory: " + directory); try { Utils.delete(directory);