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

Merge pull request #78 from thematthopkins/less_sudo_2 

only update hosts file if it has changed - for both host and guest

Closes #68.
This commit is contained in:
Paulo Bittencourt 2014-02-24 23:24:42 -05:00
parent a7a90d5aae 3051f4b3e3
commit 56ce9f895d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vagrant-hostmanager/hosts_file.rb
View File

@ -19,11 +19,13 @@ module VagrantPlugins
# download and modify file with Vagrant-managed entries # download and modify file with Vagrant-managed entries
file = @global_env.tmp_path.join("hosts.#{machine.name}") file = @global_env.tmp_path.join("hosts.#{machine.name}")
machine.communicate.download(realhostfile, file) machine.communicate.download(realhostfile, file)
update_file(file, machine, false) if update_file(file, machine, false)
# upload modified file and remove temporary file
machine.communicate.upload(file, '/tmp/hosts')
machine.communicate.sudo("#{move_cmd} /tmp/hosts #{realhostfile}")
end
# upload modified file and remove temporary file
machine.communicate.upload(file, '/tmp/hosts')
machine.communicate.sudo("#{move_cmd} /tmp/hosts #{realhostfile}")
# i have no idea if this is a windows competibility issue or not, but sometimes it dosen't work on my machine # i have no idea if this is a windows competibility issue or not, but sometimes it dosen't work on my machine
begin begin
FileUtils.rm(file) FileUtils.rm(file)
@ -49,16 +51,19 @@ module VagrantPlugins
end end
FileUtils.cp(hosts_location, file) FileUtils.cp(hosts_location, file)
update_file(file) if update_file(file)
copy_proc.call copy_proc.call
end
end end
private private
def update_file(file, resolving_machine = nil, include_id = true) def update_file(file, resolving_machine = nil, include_id = true)
file = Pathname.new(file) file = Pathname.new(file)
new_file_content = update_content(file.read, resolving_machine, include_id) old_file_content = file.read
new_file_content = update_content(old_file_content, resolving_machine, include_id)
file.open('w') { |io| io.write(new_file_content) } file.open('w') { |io| io.write(new_file_content) }
old_file_content != new_file_content
end end
def update_content(file_content, resolving_machine, include_id) def update_content(file_content, resolving_machine, include_id)