github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

remove explicit references to ruby implementation and version

Browse source 
Fixes #2184
This commit is contained in:
Joao Duarte 2014-12-05 15:05:06 +00:00 • committed by Jordan Sissel
parent d6beaccc0c
commit f77c08086b
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rakelib/plugin.rake
View file

@ -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'

2
rakelib/vendor.rake
View file

@ -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')