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

Merge pull request #2505 from jaugustin/shell-keep-color 

provisioner/shell: add keep_color option to allow custom color output
This commit is contained in:
Mitchell Hashimoto 2013-11-23 16:03:15 -08:00
parent 9f91240884 722e9e6afb
commit 2a35ec425c
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/provisioners/shell/config.rb
View File

@ -9,6 +9,7 @@ module VagrantPlugins
attr_accessor :args attr_accessor :args
attr_accessor :privileged attr_accessor :privileged
attr_accessor :binary attr_accessor :binary
attr_accessor :keep_color
def initialize def initialize
@args = UNSET_VALUE @args = UNSET_VALUE
@ -17,6 +18,7 @@ module VagrantPlugins
@upload_path = UNSET_VALUE @upload_path = UNSET_VALUE
@privileged = UNSET_VALUE @privileged = UNSET_VALUE
@binary = UNSET_VALUE @binary = UNSET_VALUE
@keep_color = UNSET_VALUE
end end
def finalize! def finalize!
@ -26,6 +28,7 @@ module VagrantPlugins
@upload_path = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE @upload_path = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE
@privileged = true if @privileged == UNSET_VALUE @privileged = true if @privileged == UNSET_VALUE
@binary = false if @binary == UNSET_VALUE @binary = false if @binary == UNSET_VALUE
@keep_color = false if @keep_color == UNSET_VALUE
end end
def validate(machine) def validate(machine)

12
plugins/provisioners/shell/provisioner.rb
View File

@ -37,9 +37,15 @@ module VagrantPlugins
# Note: Be sure to chomp the data to avoid the newlines that the # Note: Be sure to chomp the data to avoid the newlines that the
# Chef outputs. # Chef outputs.
@machine.env.ui.info( if config.keep_color
data, @machine.env.ui.info(
:color => color, :new_line => false, :prefix => false) data,
:new_line => false, :prefix => false)
else
@machine.env.ui.info(
data,
:color => color, :new_line => false, :prefix => false)
end
end end
end end
end end

4
website/docs/source/v2/provisioning/shell.html.md
View File

@ -45,6 +45,10 @@ The remainder of the available options are optional:
be uploaded to. The script is uploaded as the SSH user over SCP, so this be uploaded to. The script is uploaded as the SSH user over SCP, so this
location must be writable to that user. By default this is "/tmp/vagrant-shell" location must be writable to that user. By default this is "/tmp/vagrant-shell"
* `keep_color` (boolean) - Vagrant automatically color output in green and
red (errors). If this is true, then Vagrant will not do this. By default
this is "false". This allow you to have custom colored output.
<a name="inline-scripts"></a> <a name="inline-scripts"></a>
## Inline Scripts ## Inline Scripts