Restore lost PATH lookup during executable search. Fixes #4809.

jruby · Mar 22, 2018 · b0f7aaf · b0f7aaf
1 parent 807900a
commit b0f7aaf
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
@@ -420,9 +420,16 @@ public static File findPathExecutable(Ruby runtime, String fname) {
     // MRI: Hopefully close to dln_find_exe_r used by popen logic
     public static File findPathExecutable(Ruby runtime, String fname, IRubyObject pathObject) {
         String[] pathNodes;
+
         if (pathObject == null || pathObject.isNil()) {
+            RubyHash env = (RubyHash) runtime.getObject().getConstant("ENV");
+            pathObject = env.op_aref(runtime.getCurrentContext(), RubyString.newString(runtime, PATH_ENV));
+        }
+
+        if (pathObject == null) {
             pathNodes = DEFAULT_PATH; // ASSUME: not modified by callee
         }
+
         else {
             String pathSeparator = System.getProperty("path.separator");
             String path = pathObject.toString();