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

Commit

Permalink
Require relatively from exe/ when possible
Browse files Browse the repository at this point in the history
  • Loading branch information
deivid-rodriguez committed Aug 17, 2019
1 parent fb587b9 commit e4cbb91
Showing 1 changed file with 19 additions and 3 deletions.
22 changes: 19 additions & 3 deletions exe/bundle
Expand Up @@ -7,7 +7,14 @@ Signal.trap("INT") do
exit 1
end

require "bundler"
base_path = File.expand_path("../lib", __dir__)

if File.exist?(base_path)
require_relative "../lib/bundler"
else
require "bundler"
end

# 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 +25,18 @@ $LOAD_PATH.each do |path|
abort(err)
end

require "bundler/friendly_errors"
if File.exist?(base_path)
require_relative "../lib/bundler/friendly_errors"
else
require "bundler/friendly_errors"
end

Bundler.with_friendly_errors do
require "bundler/cli"
if File.exist?(base_path)
require_relative "../lib/bundler/cli"
else
require "bundler/cli"
end

# Allow any command to use --help flag to show help for that command
help_flags = %w[--help -h]
Expand Down

0 comments on commit e4cbb91

Please sign in to comment.