`bundler` bin for those who confuse it with `bundle`

2 files changed, 11 insertions, 1 deletions

diff --git a/bin/bundle b/bin/bundle
index ffa0d75f65..3456c5e875 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -5,7 +5,7 @@ Signal.trap("INT") { exit 1 }
 
 require 'bundler'
 # Check if an older version of bundler is installed
-$:.each do |path|
+$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"
diff --git a/bin/bundler b/bin/bundler
new file mode 100755
index 0000000000..35941a2ae4
--- /dev/null
+++ b/bin/bundler
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'bundler'
+require 'bundler/cli'
+
+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