Skip to content

Commit

Permalink
Showing 3 changed files with 2 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -245,8 +245,8 @@ else if ( procArity < 0 && methodArity >= -(procArity + 1) ) { // *splat that fi
mostSpecific = candidate; msTypes = cTypes;
mostSpecificArity = methodArity; // ambiguous = false;
}
ambiguous = false;
}
ambiguous = false;
continue; /* OUTER */
}
}
5 changes: 0 additions & 5 deletions core/src/main/java/org/jruby/util/ShellLauncher.java
Original file line number Diff line number Diff line change
@@ -1262,11 +1262,6 @@ public void verifyExecutableForShell() {
execArgs[0] = shell;
execArgs[1] = shell.endsWith("sh") ? "-c" : "/c";

// HACK to get the builtin command right
if (cmdline.startsWith("\"java -cp") && cmdline.contains("org.jruby.Main\"")) {
cmdline = cmdline.replace("\"java -cp", "java -cp")
.replace("org.jruby.Main\"", "org.jruby.Main");
}
if (Platform.IS_WINDOWS) {
// that's how MRI does it too
execArgs[2] = "\"" + cmdline + "\"";
3 changes: 1 addition & 2 deletions lib/ruby/stdlib/rubygems/defaults/jruby.rb
Original file line number Diff line number Diff line change
@@ -12,8 +12,7 @@ class << self
def ruby
ruby_path = original_ruby
if jarred_path?(ruby_path)
# use quote as the original_ruby does it
ruby_path = "\"#{org.jruby.util.ClasspathLauncher.jrubyCommand(JRuby.runtime)}\""
ruby_path = "#{org.jruby.util.ClasspathLauncher.jrubyCommand(JRuby.runtime)}"
end
ruby_path
end

0 comments on commit 3d56dd3

Please sign in to comment.