This should fix test_pid by only using shell for special chars.

jruby · Apr 23, 2015 · ae86ae7 · ae86ae7
1 parent 8d8842b
commit ae86ae7
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -723,7 +723,7 @@ private static Process popenShared(Ruby runtime, IRubyObject[] strings) throws I
     }
 
     private static Process popenShared(Ruby runtime, IRubyObject[] strings, Map env) throws IOException {
-        return popenShared(runtime, strings, env, false);
+        return popenShared(runtime, strings, env, true);
     }
 
     private static Process popenShared(Ruby runtime, IRubyObject[] strings, Map env, boolean addShell) throws IOException {
@@ -749,10 +749,9 @@ private static Process popenShared(Ruby runtime, IRubyObject[] strings, Map env,
 
             String[] args = parseCommandLine(runtime.getCurrentContext(), runtime, strings);
             LaunchConfig lc = new LaunchConfig(runtime, strings, false);
-            boolean useShell = lc.shouldRunInShell();
+            boolean useShell = Platform.IS_WINDOWS ? lc.shouldRunInShell() : false;
             if (addShell) for (String arg : args) useShell |= shouldUseShell(arg);
-
-            // CON: popen is a case where I think we should just always shell out.
+
             if (strings.length == 1) {
                 if (useShell) {
                     // single string command, pass to sh to expand wildcards