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

Use :SystemRoot to detect Windows, including git-bash. Also use :Windir to ensure we get correct hosts file path

This commit is contained in:
Tim Brown 2013-11-11 14:10:11 -08:00
parent 5e785f819d
commit 8f3dd06d8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,8 @@ module VagrantPlugins
realhostfile = '/etc/inet/hosts' realhostfile = '/etc/inet/hosts'
move_cmd = 'mv' move_cmd = 'mv'
elsif (machine.communicate.test("test -d $Env:SystemRoot")) elsif (machine.communicate.test("test -d $Env:SystemRoot"))
realhostfile = 'C:\Windows\System32\Drivers\etc\hosts' realhostfile = "#{ENV['WINDIR']}\\System32\\drivers\\etc\\hosts"
move_cmd = 'mv -force' move_cmd = 'mv -force'
else else
realhostfile = '/etc/hosts' realhostfile = '/etc/hosts'
@ -38,7 +39,7 @@ module VagrantPlugins
hosts_location = '/etc/hosts' hosts_location = '/etc/hosts'
copy_cmd = 'sudo cp' copy_cmd = 'sudo cp'
# handles the windows hosts file... # handles the windows hosts file...
if ENV['OS'] == 'Windows_NT' if ENV['SystemRoot'] != nil
hosts_location = "#{ENV['WINDIR']}\\System32\\drivers\\etc\\hosts" hosts_location = "#{ENV['WINDIR']}\\System32\\drivers\\etc\\hosts"
copy_cmd = 'cp' copy_cmd = 'cp'
end end