From be6644ed2c90f0b870495b8fbd67b5698943c128 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 6 Mar 2024 11:58:53 +0100 Subject: [PATCH] Fix uninstall of repackaged jars --- src/org/argeo/build/Make.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index 9f6f084..fa46498 100644 --- a/src/org/argeo/build/Make.java +++ b/src/org/argeo/build/Make.java @@ -380,7 +380,7 @@ public class Make { Path targetParent = targetJarP.getParent(); if (targetParent.startsWith(targetA2)) deleteEmptyParents(targetA2, targetParent); - if (targetParent.startsWith(nativeTargetA2)) + if (nativeTargetA2 != null && targetParent.startsWith(nativeTargetA2)) deleteEmptyParents(nativeTargetA2, targetParent); } else { // install Files.createDirectories(targetJarP.getParent()); @@ -416,6 +416,10 @@ public class Make { /** Delete empty parent directory up to the base directory (included). */ void deleteEmptyParents(Path baseDir, Path targetParent) throws IOException { + if (!targetParent.startsWith(baseDir)) + throw new IllegalArgumentException(targetParent + " does not start with " + baseDir); + if (!Files.exists(targetParent)) + deleteEmptyParents(baseDir, targetParent.getParent()); if (!Files.isDirectory(targetParent)) throw new IllegalArgumentException(targetParent + " must be a directory"); boolean isA2target = Files.isSameFile(baseDir, targetParent); -- 2.30.2