Perform executable search and use shell for bat/cmd. Fixes #5018.

jruby · Feb 13, 2018 · 95b253c · 95b253c
1 parent 131ba02
commit 95b253c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -808,7 +808,7 @@ private static Process popenShared(Ruby runtime, IRubyObject[] strings, Map env,
             }
 
             String[] args = parseCommandLine(runtime.getCurrentContext(), runtime, strings);
-            LaunchConfig lc = new LaunchConfig(runtime, strings, false);
+            LaunchConfig lc = new LaunchConfig(runtime, strings, true);
             boolean useShell = Platform.IS_WINDOWS ? lc.shouldRunInShell() : false;
             if (addShell) for (String arg : args) useShell |= shouldUseShell(arg);
 
@@ -1147,11 +1147,11 @@ public boolean shouldRunInShell() {
             // if the executable exists, start it directly with no shell
             if (executableFile != null) {
                 log(runtime, "Got it: " + executableFile);
-                // TODO: special processing for BAT/CMD files needed at all?
-                // if (isBatch(executableFile)) {
-                //    log(runtime, "This is a BAT/CMD file, will start in shell");
-                //    return true;
-                // }
+                // Windows will not launch bat/cmd files directly, so use subshell
+                if (isBatch(executableFile)) {
+                    log(runtime, "This is a BAT/CMD file, will start in shell");
+                    return true;
+                }
                 return false;
             } else {
                 log(runtime, "Didn't find executable: " + executable);