From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 Mar 2023 11:46:42 +0000 (+0100)
Subject: Improve archive download
X-Git-Tag: v2.3.5~122
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=642b596b52a99d492cc818589c6d63cf713a33bf;hp=cb6fcab3d5d5ac44dc42cdc792e66f547da09f29;p=cc0%2Fargeo-build.git

Improve archive download
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 05ea8c8..4f63c65 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -949,8 +949,9 @@ public class Repackage {
 		Path dest;
 		if (name == null) {
 			// We use also use parent directory in case the archive itself has a fixed name
-			name = url.getPath().substring(url.getPath().lastIndexOf('/') + 1)
-					.substring(url.getPath().lastIndexOf('/') + 1);
+			String[] segments = url.getPath().split("/");
+			name = segments.length > 1 ? segments[segments.length - 2] + '-' + segments[segments.length - 1]
+					: segments[segments.length - 1];
 		}
 
 		dest = dir.resolve(name);