From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 6 Mar 2024 10:58:53 +0000 (+0100)
Subject: Fix uninstall of repackaged jars
X-Git-Tag: v2.3.10~22
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=be6644ed2c90f0b870495b8fbd67b5698943c128

Fix uninstall of repackaged jars
---

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);