From 8c4ea4f47b3d25435ed1bf8eba164018d38fe94d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 20 Sep 2013 17:24:59 -0700
Subject: [PATCH] Update CHANGELOG

---
 CHANGELOG.md                              | 5 +++++
 plugins/provisioners/shell/provisioner.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a48837aa7..3356f0366 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## 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:
 
   - core: Don't output `\e[0K` anymore on Windows. [GH-2246]
diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb
index a7b3415d8..00e1ae62b 100644
--- a/plugins/provisioners/shell/provisioner.rb
+++ b/plugins/provisioners/shell/provisioner.rb
@@ -72,7 +72,7 @@ module VagrantPlugins
         end
 
         # 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,
         # and handle it specially...