From eeb2ff15613853d567606246b4435d3006b57b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 20 Jun 2019 12:37:26 +0200 Subject: [PATCH] Revert "Migrate requires from exe/ to also be relative" This reverts commit d9d2bf6d522dd36d1ef2732e87cef8b7cba729fd. --- exe/bundle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exe/bundle b/exe/bundle index fccece038b3..aaf773745d3 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]