Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Revert "Migrate requires from exe/ to also be relative" #7216

Merged
1 commit merged into from Jun 24, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions exe/bundle
Expand Up @@ -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
Expand All @@ -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]
Expand Down