jruby · Feb 9, 2016 · Feb 9, 2016
Showing with 26 additions and 3 deletions.

+2 −2 core/src/main/java/org/jruby/Main.java

+2 −1 core/src/main/java/org/jruby/RubyKernel.java

+1 −0 spec/regression/GH-3653_check_no_expansion.rb

+21 −0 spec/regression/GH-3653_system_under_chdir_expands_env.rb
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -258,10 +258,10 @@ public Status run() {
     private Status internalRun() {
         doShowVersion();
         doShowCopyright();
+        doPrintProperties();
 
-        if (!config.getShouldRunInterpreter() ) {
+        if (!config.getShouldRunInterpreter()) {
             doPrintUsage(false);
-            doPrintProperties();
             return new Status();
         }
 

diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1520,8 +1520,9 @@ public static IRubyObject system(ThreadContext context, IRubyObject recv, IRubyO
     @JRubyMethod(name = "system", required = 1, rest = true, module = true, visibility = PRIVATE)
     public static IRubyObject system19(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         Ruby runtime = context.runtime;
+        boolean needChdir = !runtime.getCurrentDirectory().equals(runtime.getPosix().getcwd());
 
-        if (runtime.getPosix().isNative() && !Platform.IS_WINDOWS) {
+        if (!needChdir && runtime.getPosix().isNative() && !Platform.IS_WINDOWS) {
             // MRI: rb_f_system
             long pid;
             int[] status = new int[1];

diff --git a/spec/regression/GH-3653_check_no_expansion.rb b/spec/regression/GH-3653_check_no_expansion.rb
@@ -0,0 +1 @@
+exit(1) unless ARGV[0] == "$GH3653"
diff --git a/spec/regression/GH-3653_system_under_chdir_expands_env.rb b/spec/regression/GH-3653_system_under_chdir_expands_env.rb
@@ -0,0 +1,21 @@
+require 'tmpdir'
+
+describe "Kernel#system when called during a Dir.chdir" do
+  it "does not expand environment variables" do
+    def sh(*cmd)
+      res = system(*cmd)
+      status = $?
+      p [res, status]
+    end
+
+    ENV['GH3653'] = 'someval'
+
+
+    Dir.chdir(Dir.tmpdir) do
+      sh ENV_JAVA['jruby.home'] + '/bin/jruby', File.dirname(__FILE__) + '/GH-3653_check_no_expansion.rb', '$GH3653'
+    end
+
+    expect($?.exitstatus).to eq(0)
+  end
+end
+