remove check for Bundler 0.82-0-dev-archived

2 files changed, 11 insertions, 23 deletions

diff --git a/bin/bundle b/bin/bundle
index 3456c5e875..2e27f7e433 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -3,20 +3,8 @@
 # Exit cleanly from an early interrupt
 Signal.trap("INT") { exit 1 }
 
-require 'bundler'
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
-  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
-    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)
-  end
-end
-
-require 'bundler/cli'
-# Force Thor to raise exceptions so we can exit non-zero.
-ENV["THOR_DEBUG"] = "1"
-
 require 'bundler/friendly_errors'
-Bundler.with_friendly_errors { Bundler::CLI.start }
+Bundler.with_friendly_errors do
+  require 'bundler/cli'
+  Bundler::CLI.start(ARGV, :debug => true)
+end
diff --git a/bin/bundler b/bin/bundler
index 35941a2ae4..2e27f7e433 100755
--- a/bin/bundler
+++ b/bin/bundler
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'bundler'
-require 'bundler/cli'
+# Exit cleanly from an early interrupt
+Signal.trap("INT") { exit 1 }
 
-ui = Bundler::UI::Shell.new
-ui.error "It's recommended to use Bundler through 'bundle' binary instead of 'bundler'"
-
-bin = "#{File.dirname(__FILE__)}/bundle #{ARGV.join(" ")}"
-exec bin
+require 'bundler/friendly_errors'
+Bundler.with_friendly_errors do
+  require 'bundler/cli'
+  Bundler::CLI.start(ARGV, :debug => true)
+end