diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-02 14:08:28 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-18 13:45:05 +0900 |
commit | c50c2354cf9a43978626e5573e72574516b28da9 (patch) | |
tree | 55fc9bdaaa3bc109f27d5e1422617649d9bd71ce /libexec/bundle | |
parent | 998204882b25f0cee5db1749a877ef9780c8925f (diff) | |
download | ruby-c50c2354cf9a43978626e5573e72574516b28da9.tar.gz |
[bundler/bundler] Require relatively from exe/ when possible
https://github.com/bundler/bundler/commit/e4cbb91b7d
Diffstat (limited to 'libexec/bundle')
-rwxr-xr-x | libexec/bundle | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libexec/bundle b/libexec/bundle index aaf773745d..b3b1b691d8 100755 --- a/libexec/bundle +++ b/libexec/bundle @@ -7,7 +7,14 @@ Signal.trap("INT") do exit 1 end -require "bundler" +base_path = File.expand_path("../lib", __dir__) + +if File.exist?(base_path) + require_relative "../lib/bundler" +else + require "bundler" +end + # Check if an older version of bundler is installed $LOAD_PATH.each do |path| next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9 @@ -18,9 +25,18 @@ $LOAD_PATH.each do |path| abort(err) end -require "bundler/friendly_errors" +if File.exist?(base_path) + require_relative "../lib/bundler/friendly_errors" +else + require "bundler/friendly_errors" +end + Bundler.with_friendly_errors do - require "bundler/cli" + if File.exist?(base_path) + require_relative "../lib/bundler/cli" + else + require "bundler/cli" + end # Allow any command to use --help flag to show help for that command help_flags = %w[--help -h] |