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

Update CHANGELOG

This commit is contained in:
Mitchell Hashimoto 2013-09-20 17:24:59 -07:00
parent 5fe6d7a525
commit 8c4ea4f47b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
## 1.3.4 (unreleased) ## 1.3.4 (unreleased)
FEATURES:
- provisioners/shell: Specify the `binary` option as true and Vagrant won't
automatically replace Windows line endings with Unix ones. [GH-2235]
BUG FIXES: BUG FIXES:
- core: Don't output `\e[0K` anymore on Windows. [GH-2246] - core: Don't output `\e[0K` anymore on Windows. [GH-2246]

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

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