Merge remote-tracking branch 'upstream/master' into upstream

README.md

@@ -8,6 +8,9 @@ Vagrant Host Manager
 
 `vagrant-hostmanager` is a Vagrant plugin that manages the `hosts` file on guest machines (and optionally the host). Its goal is to enable resolution of multi-machine environments deployed with a cloud provider where IP addresses are not known in advance.
 
+Do you like what we do? Consider supporting us through Patreon. All of the money goes directly back into growing our collection of open source and free software.
+[![Patreon](https://img.shields.io/badge/patreon-donate-red.svg)](https://www.patreon.com/devopsgroup)
+
 Installation
 ------------
 

lib/vagrant-hostmanager/hosts_file/updater.rb

@@ -88,8 +88,8 @@ module VagrantPlugins
 
         def update_content(file_content, resolving_machine, include_id, line_endings)
           id = include_id ? " id: #{read_or_create_id}" : ""
-          header = "## vagrant-hostmanager-start#{id}\n"
-          footer = "## vagrant-hostmanager-end\n"
+          header = "## vagrant-hostmanager-start#{id}"
+          footer = "## vagrant-hostmanager-end"
           body = get_machines
             .map { |machine| get_hosts_file_entry(machine, resolving_machine) }
             .join
@@ -146,12 +146,12 @@ module VagrantPlugins
           if body.empty?
             block = "\n"
           else
-            block = "\n\n" + header + body + footer + "\n"
+            block = "\n\n" + header + "\n" + body + footer + "\n\n"
           end
           # Pattern for finding existing block
           header_pattern = Regexp.quote(header)
           footer_pattern = Regexp.quote(footer)
-          pattern = Regexp.new("\n*#{header_pattern}.*?#{footer_pattern}\n*", Regexp::MULTILINE)
+          pattern = Regexp.new("[\r\n]*#{header_pattern}.*?#{footer_pattern}[\r\n]*", Regexp::MULTILINE)
           # Replace existing block or append
           content = old_content.match(pattern) ? old_content.sub(pattern, block) : old_content.rstrip + block
           if line_endings == "crlf"

lib/vagrant-hostmanager/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostManager
-    VERSION = '1.8.8'
+    VERSION = '1.8.9'
   end
 end