diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-04-01 20:36:59 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-04-28 19:08:49 +0900 |
| commit | 678d58c8508ec46aa270e3c5d81fc09cd0fee175 (patch) | |
| tree | 34cbc8bb12e609d7a73e35c513090264360ffb49 /lib/bundler/shared_helpers.rb | |
| parent | 479ba9a44b6beda1dce32842bcbc66b6f46a85a0 (diff) | |
Merge rubygems master 1e4eda741d732ca1bd7031aef0a16c7348adf7a5
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5669
Diffstat (limited to 'lib/bundler/shared_helpers.rb')
| -rw-r--r-- | lib/bundler/shared_helpers.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index ed0b072b65..ffdbdee503 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -274,10 +274,10 @@ module Bundler def set_bundle_variables # bundler exe & lib folders have same root folder, typical gem installation - exe_file = File.expand_path("../../../exe/bundle", __FILE__) + exe_file = File.expand_path("../../exe/bundle", __dir__) # for Ruby core repository testing - exe_file = File.expand_path("../../../libexec/bundle", __FILE__) unless File.exist?(exe_file) + exe_file = File.expand_path("../../libexec/bundle", __dir__) unless File.exist?(exe_file) # bundler is a default gem, exe path is separate exe_file = Bundler.rubygems.bin_path("bundler", "bundle", VERSION) unless File.exist?(exe_file) @@ -309,7 +309,7 @@ module Bundler end def bundler_ruby_lib - resolve_path File.expand_path("../..", __FILE__) + File.expand_path("..", __dir__) end def clean_load_path |