52c3af5
From 7e5f12832e4d87dda7cde9b073b2a382b1cdcb9d Mon Sep 17 00:00:00 2001
fd98864
From: Michael Simacek <msimacek@redhat.com>
fd98864
Date: Tue, 2 Jun 2015 22:52:21 +0200
b5818bc
Subject: [PATCH] Fedora jetty.home
fd98864
fd98864
---
52c3af5
 .../java/org/eclipse/jetty/start/config/CommandLineConfigSource.java   | 3 +++
52c3af5
 1 file changed, 3 insertions(+)
fd98864
fd98864
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
52c3af5
index d1facfe..70f0366 100644
fd98864
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
fd98864
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
52c3af5
@@ -120,6 +120,9 @@ public class CommandLineConfigSource implements ConfigSource
fd98864
                 try
fd98864
                 {
52c3af5
                     Path home = new File(new URI(m.group(1))).getParentFile().toPath();
52c3af5
+                    if (home.endsWith("/usr/share/java/jetty"))
52c3af5
+                        home = new File(home.toString().replaceAll("java/jetty$", "jetty")).toPath();
52c3af5
+
52c3af5
                     setProperty(BaseHome.JETTY_HOME,home.toString(),ORIGIN_INTERNAL_FALLBACK);
52c3af5
                     return home;
fd98864
                 }
fd98864
-- 
3274771
2.9.3
fd98864