From f77c08086b191d2bbe9e77783354dda248c5170f Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Fri, 5 Dec 2014 15:05:06 +0000 Subject: [PATCH] remove explicit references to ruby implementation and version Fixes #2184 --- rakelib/plugin.rake | 5 ++--- rakelib/vendor.rake | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rakelib/plugin.rake b/rakelib/plugin.rake index 006b1b845..8aa82e067 100644 --- a/rakelib/plugin.rake +++ b/rakelib/plugin.rake @@ -18,10 +18,9 @@ namespace "plugin" do "GEM_PATH" => [ ENV['GEM_PATH'], ::File.join(LogStash::Environment::LOGSTASH_HOME, 'build/bootstrap'), - ::File.join(LogStash::Environment::LOGSTASH_HOME, 'vendor/bundle/jruby/1.9'), - ::File.join(LogStash::Environment::LOGSTASH_HOME, 'vendor/jruby/lib/ruby/gems/shared') + LogStash::Environment.gem_home ].join(":"), - "GEM_HOME" => ::File.join(LogStash::Environment::LOGSTASH_HOME, "vendor/plugins/jruby/1.9"), + "GEM_HOME" => LogStash::Environment.plugins_home, "BUNDLE_GEMFILE" => "tools/Gemfile.plugins" } if ENV['USE_RUBY'] != '1' diff --git a/rakelib/vendor.rake b/rakelib/vendor.rake index 3d2f040dd..b44215e90 100644 --- a/rakelib/vendor.rake +++ b/rakelib/vendor.rake @@ -243,7 +243,7 @@ namespace "vendor" do backup_gem_home = ENV['GEM_HOME'] backup_gem_path = ENV['GEM_PATH'] env = { - 'GEM_HOME' => ::File.join(LogStash::Environment::LOGSTASH_HOME, LogStash::Environment.gem_home), + 'GEM_HOME' => LogStash::Environment.gem_home, 'GEM_PATH' => [ ::File.join(LogStash::Environment::LOGSTASH_HOME, 'build/bootstrap'), ::File.join(LogStash::Environment::LOGSTASH_HOME, 'vendor/jruby/lib/ruby/gems/shared')