From e3d2d11e8aebd3a4d846561a52055aad2b7603b0 Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Tue, 21 Jul 2020 09:09:37 +0300
Subject: [PATCH] Make sure VIMRC doesn't contain \r (fix #476) (#482)

---
 src/steps/vim.rs | 2 +-
 src/utils.rs     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/steps/vim.rs b/src/steps/vim.rs
index b1c10674..4b8be0f7 100644
--- a/src/steps/vim.rs
+++ b/src/steps/vim.rs
@@ -35,7 +35,7 @@ fn nvimrc(base_dirs: &BaseDirs) -> Option<PathBuf> {
 
 fn upgrade(vim: &PathBuf, vimrc: &PathBuf, ctx: &ExecutionContext) -> Result<()> {
     let mut tempfile = tempfile::NamedTempFile::new()?;
-    tempfile.write_all(UPGRADE_VIM.as_bytes())?;
+    tempfile.write_all(UPGRADE_VIM.replace('\r', "").as_bytes())?;
     debug!("Wrote vim script to {:?}", tempfile.path());
 
     let output = ctx
diff --git a/src/utils.rs b/src/utils.rs
index 26171632..cd49928c 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -45,8 +45,10 @@ where
 {
     fn if_exists(self) -> Option<Self> {
         if self.as_ref().exists() {
+            debug!("Path {:?} exists", self.as_ref());
             Some(self)
         } else {
+            debug!("Path {:?} doesn't exist", self.as_ref());
             None
         }
     }