fix: simplify method was too simple

jbangdev · Feb 22, 2024 · d1681c2 · d1681c2
1 parent 02a7485
commit d1681c2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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;
  }
  }