From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 23 Mar 2023 06:06:47 +0000 (+0100)
Subject: Improve repackage readme
X-Git-Tag: v2.3.5~7
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=355e405d5613237930d044d7194707b19c0b258f;p=cc0%2Fargeo-build.git

Improve repackage readme
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 538c4ee..b4b95c1 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1478,24 +1478,23 @@ public class Repackage {
 					logger.log(ERROR, "No licence URL for " + jarDir);
 				}
 			}
-			writer.write("\n");
 
 			// origin
-			String m2Repo = ARGEO_ORIGIN_M2_REPO.get(mapping);
-			String originDesc = ARGEO_ORIGIN_M2.get(mapping);
+			String originDesc = ARGEO_ORIGIN_URI.get(mapping);
 			if (originDesc != null)
-				writer.append("The original component has M2 coordinates:\n" + originDesc.replace(',', '\n') + "\n"
-						+ (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
+				writer.append("\nThe original component comes from " + originDesc + ".\n");
 			else {
-				originDesc = ARGEO_ORIGIN_URI.get(mapping);
+				String m2Repo = ARGEO_ORIGIN_M2_REPO.get(mapping);
+				originDesc = ARGEO_ORIGIN_M2.get(mapping);
 				if (originDesc != null)
-					writer.append("The original component comes from " + originDesc + ".\n");
+					writer.append("\nThe original component has M2 coordinates:\n" + originDesc.replace(',', '\n')
+							+ "\n" + (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
 				else
 					logger.log(ERROR, "Cannot find origin information in " + jarDir);
 			}
 			String originSources = ARGEO_ORIGIN_SOURCES_URI.get(mapping);
 			if (originSources != null)
-				writer.append("The original sources come from " + originSources + ".\n");
+				writer.append("\nThe original sources come from " + originSources + ".\n");
 
 			if (Files.exists(jarDir.resolve(CHANGES)))
 				writer.append("\nA detailed list of changes is available under " + CHANGES + ".\n");
@@ -1508,7 +1507,6 @@ public class Repackage {
 					writer.append("Corresponding sources are available under OSGI-OPT/src.\n");
 			}
 		}
-
 	}
 
 	/**