From c5f8ee3738459b199561ae38299cabf071cd55f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schalk=20W=2E=20Cronj=C3=A9?= Date: Sun, 21 Dec 2014 23:31:07 +0000 Subject: [PATCH] Clean up some bits after confirming that system search path works cross-platform --- src/main/groovy/com/github/jrubygradle/JRubyExec.groovy | 1 - .../com/github/jrubygradle/internal/JRubyExecDelegate.groovy | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy b/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy index 964cb769..9fa0cd3c 100644 --- a/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy +++ b/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy @@ -244,7 +244,6 @@ class JRubyExec extends JavaExec { Map getPreparedEnvironment(Map env) { JRubyExecUtils.preparedEnvironment(env,inheritRubyEnv) + [ - //(JRubyExecUtils.pathVar()) : getComputedPATH(System.env."${JRubyExecUtils.pathVar()}"), 'PATH' : getComputedPATH(System.env."${JRubyExecUtils.pathVar()}"), 'GEM_HOME' : getGemWorkDir().absolutePath, ] diff --git a/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy b/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy index 963c647c..2db18667 100644 --- a/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy +++ b/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy @@ -153,7 +153,7 @@ class JRubyExecDelegate { } setEnvironment JRubyExecUtils.preparedEnvironment(getEnvironment(),proxy.inheritRubyEnv) - environment pathVar , JRubyExecUtils.prepareWorkingPath(gemDir,System.env."${pathVar}") + environment 'PATH' : JRubyExecUtils.prepareWorkingPath(gemDir,System.env."${pathVar}") environment 'GEM_HOME' : gemDir.absolutePath } }