From 29d160bf916b4ab358a01496029f9aaa5fba66b3 Mon Sep 17 00:00:00 2001

From: Mat Booth <mat.booth@redhat.com>

Date: Mon, 9 Sep 2019 12:42:10 +0100

Subject: [PATCH 1/2] Distro jetty.home

---

 .../org/eclipse/jetty/start/config/CommandLineConfigSource.java | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java

index 30440c4..cb0ed3d 100644

--- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java

+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java

@@ -120,6 +120,8 @@ public class CommandLineConfigSource implements ConfigSource

                 try

                 {

                     Path home = new File(new URI(m.group(1))).getParentFile().toPath();

+                    if (home.endsWith("/usr/share/java/jetty"))

+                        home = new File(home.toString().replaceAll("java/jetty$", "jetty")).toPath();

                     setProperty(BaseHome.JETTY_HOME, home.toString(), ORIGIN_INTERNAL_FALLBACK);

                     return home;

                 }

-- 

2.26.2