diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-06-20 12:37:26 +0200 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-06-20 17:46:44 +0200 |
commit | eeb2ff15613853d567606246b4435d3006b57b8a (patch) | |
tree | 56b6b69cf6985b8033d0bbd05e11df59c27e5427 /exe | |
parent | bfd4ea424d86ee68f6d456fa4be1078b592311fc (diff) | |
download | bundler-eeb2ff15613853d567606246b4435d3006b57b8a.tar.gz |
Revert "Migrate requires from exe/ to also be relative"revert_relative_require_from_executable
This reverts commit d9d2bf6d522dd36d1ef2732e87cef8b7cba729fd.
Diffstat (limited to 'exe')
-rwxr-xr-x | exe/bundle | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/exe/bundle b/exe/bundle index fccece038b..aaf773745d 100755 --- a/exe/bundle +++ b/exe/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] |