diff --git a/bin/vagrant b/bin/vagrant index 3e92c3a75..4dcad0dc5 100755 --- a/bin/vagrant +++ b/bin/vagrant @@ -1,15 +1,9 @@ #!/usr/bin/env ruby -begin - require File.expand_path('../../.bundle/environment', __FILE__) -rescue LoadError - # Fallback on rubygems - require "rubygems" -end +require 'rubygems' -require 'git-style-binary/command' +# Get library +libdir = File.join(File.dirname(__FILE__), '..', 'lib') +require File.expand_path('vagrant', libdir) -GitStyleBinary.primary do - version "0.2.0" - - run { educate } -end +# Call the command +Vagrant::Command.execute(*ARGV) \ No newline at end of file diff --git a/bin/vagrant-box b/bin/vagrant-box deleted file mode 100755 index 262478032..000000000 --- a/bin/vagrant-box +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env ruby -begin - require File.expand_path('../../.bundle/environment', __FILE__) -rescue LoadError - # Fallback on rubygems - require "rubygems" -end - -require 'git-style-binary/command' - -# Get library -libdir = File.join(File.dirname(__FILE__), '..', 'lib') -require File.expand_path('vagrant', libdir) - -GitStyleBinary.command do - short_desc "manage boxes" - banner <<-EOS -Usage: - -#{command.full_name} add name uri -#{command.full_name} remove name - -Add and remove vagrant boxes. - -EOS - - run do |command| - begin - Vagrant::Commands.execute(:box, command.argv) - rescue ArgumentError - educate - end - end -end diff --git a/bin/vagrant-status b/bin/vagrant-status deleted file mode 100755 index 123161bc1..000000000 --- a/bin/vagrant-status +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env ruby -begin - require File.expand_path('../../.bundle/environment', __FILE__) -rescue LoadError - # Fallback on rubygems - require "rubygems" -end - -require 'git-style-binary/command' - -# Get library -libdir = File.join(File.dirname(__FILE__), '..', 'lib') -require File.expand_path('vagrant', libdir) - -GitStyleBinary.command do - short_desc "Outputs the status of the current environment" - banner <<-EOS -Usage: #{command.full_name} #{all_options_string} - -This command outputs the status of the current environment. This command -tells you whether the environment is created, running, suspended, -etc. - -EOS - - run do |command| - Vagrant::Commands.execute(:status) - end -end diff --git a/bin/vagrant-temp b/bin/vagrant-temp deleted file mode 100755 index 4dcad0dc5..000000000 --- a/bin/vagrant-temp +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env ruby -require 'rubygems' - -# Get library -libdir = File.join(File.dirname(__FILE__), '..', 'lib') -require File.expand_path('vagrant', libdir) - -# Call the command -Vagrant::Command.execute(*ARGV) \ No newline at end of file