improve test on whether jrubyHome is inside a jar

this fixes issue #3220 Sponsored by Lookout Inc.
jruby · Aug 4, 2015 · ee8ed2c · ee8ed2c
1 parent 35313b0
commit ee8ed2c
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -667,7 +667,7 @@ public static IRubyObject dirname(ThreadContext context, IRubyObject recv, IRuby
         return runtime.newString(dirname(context, jfilename)).infectBy(filename);
     }
 
-    private static Pattern PROTOCOL_PATTERN = Pattern.compile("^(uri|jar|file|classpath):([^:]*:)?//?.*");
+    static Pattern PROTOCOL_PATTERN = Pattern.compile("^(uri|jar|file|classpath):([^:]*:)?//?.*");
     public static String dirname(ThreadContext context, String jfilename) {
         String name = jfilename.replace('\\', '/');
         int minPathLength = 1;

diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -351,7 +351,7 @@ private String calculateJRubyHome() {
         // RegularFileResource absolutePath will canonicalize resources so that will change c: paths to C:.
         // We will cannonicalize on windows so that jruby.home is also C:.
         // assume all those uri-like pathnames are already in absolute form
-        if (Platform.IS_WINDOWS && !newJRubyHome.startsWith("jar:") && !newJRubyHome.startsWith("file:") && !newJRubyHome.startsWith("classpath:") && !newJRubyHome.startsWith("uri:")) {
+        if (Platform.IS_WINDOWS && !RubyFile.PROTOCOL_PATTERN.matcher(newJRubyHome).matches()) {
             File file = new File(newJRubyHome);
 
             try {
@@ -704,7 +704,7 @@ public void setEnvironment(Map newEnvironment) {
     }
 
     private void setupEnvironment(String jrubyHome) {
-        if (!new File(jrubyHome).exists() && !environment.containsKey("RUBY")) {
+        if (RubyFile.PROTOCOL_PATTERN.matcher(jrubyHome).matches() && !environment.containsKey("RUBY")) {
             // the assumption that if JRubyHome is not a regular file that jruby
             // got launched in an embedded fashion
             environment.put("RUBY", ClasspathLauncher.jrubyCommand(defaultClassLoader()) );