From e8dce409925cd6596a49036cda1ea47a7a6c602d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 9 Jun 2011 23:46:23 -0400
Subject: [PATCH] Added --no-color option

---
 CHANGELOG.md | 1 +
 bin/vagrant  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e1cd6d95..d8dd3818c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 0.7.6 (unreleased)
 
+  - Add "--no-color" as an argument and no colorized output will be used. [GH-379]
   - Added DEVICE option to the RedHat host only networking entry, which allows
     host only networking to work even if the VM has multiple NICs. [GH-382]
   - Touch the network configuration file for RedHat so that the `sed` works
diff --git a/bin/vagrant b/bin/vagrant
index d7e35fe24..8cc7a9d6e 100755
--- a/bin/vagrant
+++ b/bin/vagrant
@@ -5,10 +5,12 @@ require 'vagrant/cli'
 env = Vagrant::Environment.new
 
 begin
+  shell = ARGV.include?("--no-color") ? Thor::Shell::Basic.new : Thor::Base.shell.new
+
   # Set the UI early in case any errors are raised, and load
   # the config immediately, so we gather any new commands from
   # plugins
-  env.ui = Vagrant::UI::Shell.new(env, Thor::Base.shell.new)
+  env.ui = Vagrant::UI::Shell.new(env, shell)
   env.load!
 
   # Kick start the CLI