kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[bundler/bundler] Revert "Migrate requires from exe/ to also be relative"

Browse source 
This reverts commit d9d2bf6d522dd36d1ef2732e87cef8b7cba729fd.

eeb2ff1561
This commit is contained in:
David Rodríguez 2019-06-20 12:37:26 +02:00 • committed by Hiroshi SHIBATA
parent df011b0238
commit 33fdd87227
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libexec/bundle
View file

@ -7,7 +7,7 @@ Signal.trap("INT") do
exit 1
end
require_relative "../lib/bundler"
require "bundler"
# 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 +18,9 @@ $LOAD_PATH.each do |path|
abort(err)
end
require_relative "../lib/bundler/friendly_errors"
require "bundler/friendly_errors"
Bundler.with_friendly_errors do
require_relative "../lib/bundler/cli"
require "bundler/cli"
# Allow any command to use --help flag to show help for that command
help_flags = %w[--help -h]