Peel off options hash passed to Open3.popen3.

Fixes #1290. Fixes #1547.
jruby · Dec 2, 2014 · 66b2905 · 66b2905
1 parent 0167f3f
commit 66b2905
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -732,6 +732,13 @@ private static Process popenShared(Ruby runtime, IRubyObject[] strings, Map env,
         File pwd = new File(runtime.getCurrentDirectory());
 
         try {
+            // Peel off env hash, if given
+            IRubyObject envHash = null;
+            if (env == null && strings.length > 0 && !(envHash = TypeConverter.checkHashType(runtime, strings[0])).isNil()) {
+                strings = Arrays.copyOfRange(strings, 1, strings.length);
+                env = (Map)envHash;
+            }
+
             String[] args = parseCommandLine(runtime.getCurrentContext(), runtime, strings);
             boolean useShell = false;
             if (addShell) for (String arg : args) useShell |= shouldUseShell(arg);