kienan
/
vagrant-hostmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #264 from jalandis/feature/fix-duplication-of-windows-records 

Prevents duplicate host file records in Windows
This commit is contained in:
Seth Reeser 2018-05-18 10:21:49 -04:00 committed by GitHub
parent bc8c0eb2e3 7e434ecbb4
commit 7281daec1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vagrant-hostmanager/hosts_file/updater.rb
View File

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