From 642b596b52a99d492cc818589c6d63cf713a33bf Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 3 Mar 2023 12:46:42 +0100 Subject: [PATCH 1/1] Improve archive download --- src/org/argeo/build/Repackage.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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); -- 2.39.2