Skip to content

Commit 2de86ff

Browse files
jsvdjordansissel
authored andcommitted
remove explicit references to ruby implementation and version
Fixes #2184
1 parent 962c5c6 commit 2de86ff

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

rakelib/plugin.rake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ namespace "plugin" do
1818
"GEM_PATH" => [
1919
ENV['GEM_PATH'],
2020
::File.join(LogStash::Environment::LOGSTASH_HOME, 'build/bootstrap'),
21-
::File.join(LogStash::Environment::LOGSTASH_HOME, 'vendor/bundle/jruby/1.9'),
22-
::File.join(LogStash::Environment::LOGSTASH_HOME, 'vendor/jruby/lib/ruby/gems/shared')
21+
LogStash::Environment.gem_home
2322
].join(":"),
24-
"GEM_HOME" => ::File.join(LogStash::Environment::LOGSTASH_HOME, "vendor/plugins/jruby/1.9"),
23+
"GEM_HOME" => LogStash::Environment.plugins_home,
2524
"BUNDLE_GEMFILE" => "tools/Gemfile.plugins"
2625
}
2726
if ENV['USE_RUBY'] != '1'

rakelib/vendor.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ namespace "vendor" do
243243
backup_gem_home = ENV['GEM_HOME']
244244
backup_gem_path = ENV['GEM_PATH']
245245
env = {
246-
'GEM_HOME' => ::File.join(LogStash::Environment::LOGSTASH_HOME, LogStash::Environment.gem_home),
246+
'GEM_HOME' => LogStash::Environment.gem_home,
247247
'GEM_PATH' => [
248248
::File.join(LogStash::Environment::LOGSTASH_HOME, 'build/bootstrap'),
249249
::File.join(LogStash::Environment::LOGSTASH_HOME, 'vendor/jruby/lib/ruby/gems/shared')

0 commit comments

Comments
 (0)