From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 May 2023 09:36:32 +0000 (+0200)
Subject: Improve osgi-install
X-Git-Tag: v2.3.6~7
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=50cbbacad0b4d43a7bc7e65bb75ffc7d3266e3ef;p=cc0%2Fargeo-build.git

Improve osgi-install
---

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index a9676f8..33291b2 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -354,6 +354,9 @@ public class Make {
 			if (uninstall) { // uninstall
 				if (Files.exists(targetJarP)) {
 					Files.delete(targetJarP);
+					Path targetParent = targetJarP.getParent();
+					if (!Files.list(targetParent).iterator().hasNext())
+						Files.delete(targetParent);
 					logger.log(DEBUG, "Removed " + targetJarP);
 					count++;
 				}
@@ -362,6 +365,7 @@ public class Make {
 				boolean update = Files.exists(targetJarP);
 				Files.copy(jarP, targetJarP);
 				logger.log(DEBUG, (update ? "Updated " : "Installed ") + targetJarP);
+				count++;
 			}
 		}
 		logger.log(INFO, uninstall ? count + " bundles removed" : count + " bundles installed or updated");