Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 258be734700d
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0ca486cfaeb9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 24, 2015

  1. Use LaunchConfig to detect sh/cmd commands in popen. Fixes #2505.

    @headius
    headius committed Feb 24, 2015
    Copy the full SHA
    0ca486c View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 core/src/main/java/org/jruby/util/ShellLauncher.java
3 changes: 2 additions & 1 deletion core/src/main/java/org/jruby/util/ShellLauncher.java
View file
Original file line number Diff line number Diff line change
@@ -748,7 +748,8 @@ private static Process popenShared(Ruby runtime, IRubyObject[] strings, Map env,
}

String[] args = parseCommandLine(runtime.getCurrentContext(), runtime, strings);
boolean useShell = false;
LaunchConfig lc = new LaunchConfig(runtime, strings, false);
boolean useShell = lc.shouldRunInShell();
if (addShell) for (String arg : args) useShell |= shouldUseShell(arg);

// CON: popen is a case where I think we should just always shell out.