Dont replace Windows newlines to Unix if shell is set as binary

This commit is contained in:
Alexander Norström 2013-09-19 13:33:58 +02:00
parent 2c8cc95e79
commit b20fe8d41e
2 changed files with 5 additions and 2 deletions

View File

@ -8,6 +8,7 @@ module VagrantPlugins
attr_accessor :upload_path
attr_accessor :args
attr_accessor :privileged
attr_accessor :binary
def initialize
@args = UNSET_VALUE
@ -15,6 +16,7 @@ module VagrantPlugins
@path = UNSET_VALUE
@upload_path = UNSET_VALUE
@privileged = UNSET_VALUE
@binary = UNSET_VALUE
end
def finalize!
@ -23,6 +25,7 @@ module VagrantPlugins
@path = nil if @path == UNSET_VALUE
@upload_path = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE
@privileged = true if @privileged == UNSET_VALUE
@binary = false if @binary == UNSET_VALUE
end
def validate(machine)

View File

@ -71,8 +71,8 @@ module VagrantPlugins
script = config.inline
end
# Replace Windows line endings with Unix ones
script.gsub!(/\r\n?$/, "\n")
# Replace Windows line endings with Unix ones unless binary file
script.gsub!(/\r\n?$/, "\n") unless config.binary
# Otherwise we have an inline script, we need to Tempfile it,
# and handle it specially...