From f7e4c4df6b04b01a41492f8dcec77492c8ddfdfc Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sun, 5 Jan 2014 16:43:33 -0800
Subject: [PATCH] setup the Bundler path always

---
 bin/vagrant | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/vagrant b/bin/vagrant
index 96e7bd154..6f72807f5 100755
--- a/bin/vagrant
+++ b/bin/vagrant
@@ -57,11 +57,12 @@ end
 # Require some stuff that is NOT dependent on RubyGems
 require "vagrant/shared_helpers"
 
-# Setup our dependencies by initializing Bundler if we're using plugins
-if Vagrant.plugins_enabled?
-  require "bundler"
-  Bundler.setup
-end
+# Setup our dependencies by initializing Bundler. If we're using plugins,
+# then also initialize the paths to the plugins.
+groups = [:default]
+groups << :plugins if Vagrant.plugins_enabled?
+require "bundler"
+Bundler.setup(*groups)
 
 require 'log4r'
 require 'vagrant'