glenux/vagrant-cachier-ng
glenux/vagrant-cachier-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve check for whether we should warm up the cache or not

Browse source
This commit is contained in:
Fabio Rehm 2014-02-21 23:45:21 -03:00
parent 2db38dfa6e
commit f968e2d458
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/vagrant-cachier/bucket.rb
View file

@ -50,8 +50,7 @@ module VagrantPlugins
comm.execute("mkdir -p #{bucket_path}") comm.execute("mkdir -p #{bucket_path}")
unless symlink?(guest_path) unless symlink?(guest_path)
comm.sudo("mkdir -p `dirname #{guest_path}`") if create_parent comm.sudo("mkdir -p `dirname #{guest_path}`") if create_parent
# Bucket is empty and guest path exists if empty_dir?(bucket_path) && !empty_dir?(guest_path)
if empty_dir?(bucket_path) && directory?(guest_path)
# Warm up cache with guest machine data # Warm up cache with guest machine data
comm.sudo("shopt -s dotglob && mv #{guest_path}/* #{bucket_path}") comm.sudo("shopt -s dotglob && mv #{guest_path}/* #{bucket_path}")
end end
@ -68,8 +67,7 @@ module VagrantPlugins
comm.execute("mkdir -p #{bucket_path}") comm.execute("mkdir -p #{bucket_path}")
unless symlink?(guest_path) unless symlink?(guest_path)
comm.execute("mkdir -p `dirname #{guest_path}`") comm.execute("mkdir -p `dirname #{guest_path}`")
# Bucket is empty and guest path exists if empty_dir?(bucket_path) && !empty_dir?(guest_path)
if empty_dir?(bucket_path) && directory?(guest_path)
# Warm up cache with guest machine data # Warm up cache with guest machine data
comm.execute("shopt -s dotglob && mv #{guest_path}/* #{bucket_path}") comm.execute("shopt -s dotglob && mv #{guest_path}/* #{bucket_path}")
end end
@ -85,10 +83,6 @@ module VagrantPlugins
def symlink?(path) def symlink?(path)
comm.test("test -L #{path}") comm.test("test -L #{path}")
end end
def directory?(path)
comm.test("test -d #{path}")
end
end end
end end
end end