warn when jruby home is not set to one of the tested cases

jruby · Nov 7, 2014 · 2a159b6 · 2a159b6
1 parent adcbdc7
commit 2a159b6
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -329,12 +329,21 @@ private String calculateJRubyHome() {
 
     // We require the home directory to be absolute
     private static String verifyHome(String home, PrintStream error) {
+        if (home.equals("uri:classloader:/META-INF/jruby.home" )) {
+            return home;
+        }
         if (home.equals(".")) {
             home = SafePropertyAccessor.getProperty("user.dir");
         }
-        if (home.startsWith("cp:")) {
+        else if (home.startsWith("cp:")) {
             home = home.substring(3);
-        } else if (!home.startsWith("file:") && !home.startsWith("classpath:") && !home.startsWith("uri:")) {
+        }
+        if (home.startsWith("jar:") || ( home.startsWith("file:") && home.contains(".jar!/") ) ||
+                home.startsWith("classpath:") || home.startsWith("uri:")) {
+            error.println("Warning: JRuby home with uri like pathes may not have full functionality - use at your own risk");
+        }
+        // do not normalize on plain jar like pathes coming from jruby-rack
+        else if (!home.contains(".jar!/") && !home.startsWith("uri:")) {
             NormalizedFile f = new NormalizedFile(home);
             if (!f.isAbsolute()) {
                 home = f.getAbsolutePath();