From d1681c21908720bddab3f79d3bb0ef4b05585599 Mon Sep 17 00:00:00 2001 From: Tako Schotanus Date: Thu, 22 Feb 2024 18:58:22 +0100 Subject: [PATCH] fix: simplify method was too simple --- src/main/java/dev/jbang/catalog/Catalog.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/jbang/catalog/Catalog.java b/src/main/java/dev/jbang/catalog/Catalog.java index 31a05e926..0fbb33f33 100644 --- a/src/main/java/dev/jbang/catalog/Catalog.java +++ b/src/main/java/dev/jbang/catalog/Catalog.java @@ -402,10 +402,14 @@ static void check(boolean ok, String message) { } public static String simplifyName(String catalog) { - if (catalog.endsWith("/" + JBANG_CATALOG_REPO)) { - return catalog.substring(0, catalog.length() - 14); + if (!Util.isURL(catalog) && !isValidCatalogReference(catalog)) { + if (catalog.endsWith("/" + JBANG_CATALOG_REPO)) { + return catalog.substring(0, catalog.length() - 14); + } else { + return catalog.replace("/" + JBANG_CATALOG_REPO + "~", "~"); + } } else { - return catalog.replace("/" + JBANG_CATALOG_REPO + "~", "~"); + return catalog; } }