aboutsummaryrefslogtreecommitdiffstats
path: root/libexec
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-06-20 12:37:26 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:29:56 +0900
commit33fdd87227ac90063f8ed08de8cf36c8a257b461 (patch)
tree863f481719f384824acb6ac2fcc847b5dba3a6e0 /libexec
parentdf011b02384a85de17ae73b0aa20799c0632d18c (diff)
downloadruby-33fdd87227ac90063f8ed08de8cf36c8a257b461.tar.gz
[bundler/bundler] Revert "Migrate requires from exe/ to also be relative"
This reverts commit d9d2bf6d522dd36d1ef2732e87cef8b7cba729fd. https://github.com/bundler/bundler/commit/eeb2ff1561
Diffstat (limited to 'libexec')
-rwxr-xr-xlibexec/bundle6
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/bundle b/libexec/bundle
index fccece038b..aaf773745d 100755
--- a/libexec/bundle
+++ b/libexec/bundle
@@ -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]