haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lower some branching logic

This commit is contained in:
Mitchell Hashimoto 2014-01-05 16:17:39 -08:00
parent 73c71dbcc6
commit 8861510520
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/vagrant
View File

@ -35,12 +35,9 @@ argv.each do |arg|
end end
end end
# Require some stuff that is NOT dependent on RubyGems
require "vagrant/shared_helpers"
# First, make sure that we're executing using the proper Bundler context # First, make sure that we're executing using the proper Bundler context
# with our plugins. If we're not, then load that and reload Vagrant. # with our plugins. If we're not, then load that and reload Vagrant.
if !ENV["VAGRANT_INTERNAL_BUNDLERIZED"] && Vagrant.plugins_enabled? if !ENV["VAGRANT_INTERNAL_BUNDLERIZED"]
require "rbconfig" require "rbconfig"
ruby_path = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"]) ruby_path = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
Kernel.exec( Kernel.exec(
@ -57,6 +54,9 @@ if argv.include?("--debug")
ENV["VAGRANT_LOG"] = "debug" ENV["VAGRANT_LOG"] = "debug"
end 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 # Setup our dependencies by initializing Bundler if we're using plugins
if Vagrant.plugins_enabled? if Vagrant.plugins_enabled?
require "bundler" require "bundler"