1 files changed, 10 insertions, 12 deletions
diff --git a/libexec/bundle b/libexec/bundle
index fccece038b..92387bc2cf 100755
--- a/libexec/bundle
+++ b/libexec/bundle
@@ -7,25 +7,23 @@ Signal.trap("INT") do
   exit 1
 end
 
-require_relative "../lib/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
-  err = String.new
-  err << "Looks like you have a version of bundler that's older than 0.9.\n"
-  err << "Please remove your old versions.\n"
-  err << "An easy way to do this is by running `gem cleanup bundler`."
-  abort(err)
+base_path = File.expand_path("../lib", __dir__)
+
+if File.exist?(base_path)
+  $LOAD_PATH.unshift(base_path)
 end
 
-require_relative "../lib/bundler/friendly_errors"
+require "bundler"
+
+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]
   help_flag_used = ARGV.any? {|a| help_flags.include? a }
   args = help_flag_used ? Bundler::CLI.reformatted_help_args(ARGV) : ARGV
 
-  Bundler::CLI.start(args, :debug => true)
+  Bundler::CLI.start(args, debug: true)
 end