Improve archive download

[cc0/argeo-build.git] / src / org / argeo / build / Repackage.java

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 05ea8c8c4fa598acb9ea26d68d49a3aa9860dfb5..4f63c656298452cf72a27ddfc34229b19e7f3138 100644 (file)
--- 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);