From bfd5571377f306773da9a321ea384944a4ac2014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0abanas?= Date: Tue, 28 Sep 2021 23:21:28 +0300 Subject: [PATCH] Updated existing directories cleanup functionality to remove all their contents when unpacking archives. --- .../main/java/com/threerings/getdown/util/FileUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/threerings/getdown/util/FileUtil.java b/core/src/main/java/com/threerings/getdown/util/FileUtil.java index 513f104..a38136d 100644 --- a/core/src/main/java/com/threerings/getdown/util/FileUtil.java +++ b/core/src/main/java/com/threerings/getdown/util/FileUtil.java @@ -113,7 +113,7 @@ public final class FileUtil /** * Unpacks the specified jar file into the specified target directory. - * @param cleanExistingDirs if true, all files in all directories contained in {@code jar} will + * @param cleanExistingDirs if true, all files and subdirectories in all directories contained in {@code jar} will * be deleted prior to unpacking the jar. */ public static void unpackJar (ZipFile jar, File target, boolean cleanExistingDirs) @@ -126,10 +126,7 @@ public final class FileUtil if (entry.isDirectory()) { File efile = new File(target, entry.getName()); if (efile.exists()) { - for (File f : efile.listFiles()) { - if (!f.isDirectory()) - f.delete(); - } + deleteDirHarder(efile); } } }