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

https://github.com/bundler/bundler/commit/d9d2bf6d52
This commit is contained in:
David Rodríguez 2019-06-08 21:41:04 +02:00 коммит произвёл Hiroshi SHIBATA
Родитель 9596f43250
Коммит a27198f648
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: F9CF13417264FAC2
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -7,7 +7,7 @@ Signal.trap("INT") do
exit 1 exit 1
end end
require "bundler" require_relative "../lib/bundler"
# Check if an older version of bundler is installed # Check if an older version of bundler is installed
$LOAD_PATH.each do |path| $LOAD_PATH.each do |path|
next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9 next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
@ -18,9 +18,9 @@ $LOAD_PATH.each do |path|
abort(err) abort(err)
end end
require "bundler/friendly_errors" require_relative "../lib/bundler/friendly_errors"
Bundler.with_friendly_errors do Bundler.with_friendly_errors do
require "bundler/cli" require_relative "../lib/bundler/cli"
# Allow any command to use --help flag to show help for that command # Allow any command to use --help flag to show help for that command
help_flags = %w[--help -h] help_flags = %w[--help -h]