diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-15 16:40:33 +0200 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-16 08:43:46 +0200 |
| commit | 9437568ab4f4bed00a3f898057f280f99d128dd5 (patch) | |
| tree | 3b19f05585e5960e076b97fdbe58644bffea0b1c | |
| parent | 79fdebd86849fd70c1d2dd6e7ad9d5e1659543e5 (diff) | |
| download | bundler-9437568ab4f4bed00a3f898057f280f99d128dd5.tar.gz | |
Fix bundle bin location in core repo
| -rw-r--r-- | lib/bundler/shared_helpers.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/shared_helpers_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index af1836009f..a9bfd57fae 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -304,7 +304,7 @@ module Bundler exe_file = File.expand_path("../../../exe/bundle", __FILE__) # for Ruby core repository testing - exe_file = File.expand_path("../../../bin/bundle", __FILE__) unless File.exist?(exe_file) + exe_file = File.expand_path("../../../libexec/bundle", __FILE__) 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) diff --git a/spec/bundler/shared_helpers_spec.rb b/spec/bundler/shared_helpers_spec.rb index c5ec939978..69c21e5e38 100644 --- a/spec/bundler/shared_helpers_spec.rb +++ b/spec/bundler/shared_helpers_spec.rb @@ -394,7 +394,7 @@ RSpec.describe Bundler::SharedHelpers do it "sets BUNDLE_BIN_PATH to the bundle executable file" do subject.set_bundle_environment - bundle_exe = ruby_core? ? "../../../../bin/bundle" : "../../../exe/bundle" + bundle_exe = ruby_core? ? "../../../../libexec/bundle" : "../../../exe/bundle" bin_path = ENV["BUNDLE_BIN_PATH"] expect(bin_path).to eq(File.expand_path(bundle_exe, __FILE__)) expect(File.exist?(bin_path)).to be true |