Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #282 #283

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes #282 #283

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a16378
#282
danowar2k May 8, 2021
e9793f7
- First, if we check the change at the end, the CRLF/LF problem still…
danowar2k May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions lib/vagrant-hostmanager/hosts_file/updater.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ def update_guest(machine)

if (machine.communicate.test("uname -s | grep SunOS"))
realhostfile = "/etc/inet/hosts"
line_endings = "lf"
is_windows = false
elsif (machine.communicate.test("test -d $Env:SystemRoot"))
windir = ""
machine.communicate.execute("echo %SYSTEMROOT%", {:shell => :cmd}) do |type, contents|
windir << contents.gsub("\r\n", '') if type == :stdout
end
realhostfile = "#{windir}\\System32\\drivers\\etc\\hosts"
line_endings = "crlf"
is_windows = true
else
realhostfile = "/etc/hosts"
line_endings = "lf"
is_windows = false
end

# download and modify file with Vagrant-managed entries
Expand All @@ -39,7 +39,7 @@ def update_guest(machine)
@logger.debug("file is: #{file.to_s}")
@logger.debug("class of file is: #{file.class}")

if update_file(file, machine, false, line_endings)
if update_file(file, machine, false, is_windows)
# upload modified file and remove temporary file
machine.communicate.upload(file.to_s, "/tmp/hosts.#{machine.name}")
if windir
Expand All @@ -62,38 +62,48 @@ class << self
end
hosts_location = "#{ENV['WINDIR']}\\System32\\drivers\\etc\\hosts"
copy_proc = Proc.new { windows_copy_file(file, hosts_location) }
line_endings = "crlf"
is_windows=true
else
hosts_location = '/etc/hosts'
copy_proc = Proc.new { `[ -w "#{hosts_location}" ] && cat "#{file}" > "#{hosts_location}" || sudo cp "#{file}" "#{hosts_location}"` }
line_endings = "lf"
is_windows=false
end

FileUtils.cp(hosts_location, file)

if update_file(file, nil, true, line_endings)
if update_file(file, nil, true, is_windows)
copy_proc.call
end
end

private

def update_file(file, resolving_machine = nil, include_id = true, line_endings)
def update_file(file, resolving_machine = nil, include_id = true, is_windows)
file = Pathname.new(file)
old_file_content = file.read
new_file_content = update_content(old_file_content, resolving_machine, include_id, line_endings)
file.open('wb') { |io| io.write(new_file_content) }
old_file_content != new_file_content
# Don't care what's been read by Pathname, just convert to universal line endings for comparison
old_file_content = old_file_content.encode(old_file_content.encoding, universal_newline: true)
new_file_content = update_content(old_file_content, resolving_machine, include_id)
is_hosts_file_changed = (old_file_content != new_file_content)

if is_hosts_file_changed
if is_windows
new_file_content = new_file_content.encode(new_file_content.encoding, :crlf_newline => true)
end

file.open('wb') { |io| io.write(new_file_content) }
end
is_hosts_file_changed
end

def update_content(file_content, resolving_machine, include_id, line_endings)
def update_content(file_content, resolving_machine, include_id)
id = include_id ? " id: #{read_or_create_id}" : ""
header = "## vagrant-hostmanager-start#{id}"
footer = "## vagrant-hostmanager-end"
body = get_machines
.map { |machine| get_hosts_file_entry(machine, resolving_machine) }
.join
get_new_content(header, footer, body, file_content, line_endings)
get_new_content(header, footer, body, file_content)
end

def get_hosts_file_entry(machine, resolving_machine)
Expand Down Expand Up @@ -142,7 +152,7 @@ def get_machines
.reject(&:nil?)
end

def get_new_content(header, footer, body, old_content, line_endings)
def get_new_content(header, footer, body, old_content)
if body.empty?
block = "\n"
else
Expand All @@ -151,16 +161,9 @@ def get_new_content(header, footer, body, old_content, line_endings)
# Pattern for finding existing block
header_pattern = Regexp.quote(header)
footer_pattern = Regexp.quote(footer)
pattern = Regexp.new("[\r\n]*#{header_pattern}.*?#{footer_pattern}[\r\n]*", Regexp::MULTILINE)
pattern = Regexp.new("[\n]*#{header_pattern}.*?#{footer_pattern}[\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"
content.encode(content.encoding, :universal_encoding => true).encode(content.encoding, :crlf_newline => true)
elsif line_endings == "lf"
content.encode(content.encoding, :universal_encoding => true)
else
content.encode(content.encoding, :universal_encoding => true)
end
end

def read_or_create_id
Expand Down