X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6da11d5333d3a636b7ee9861838e24ae845a3694..c622106f2aae13e82e096dee5512b9ba68311456:/cookbooks/osmosis/recipes/default.rb diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb index 7532cd7ac..ddfd65190 100644 --- a/cookbooks/osmosis/recipes/default.rb +++ b/cookbooks/osmosis/recipes/default.rb @@ -20,17 +20,17 @@ include_recipe "chef" package "unzip" -package "openjdk-6-jre" +package "default-jre" osmosis_package = "osmosis-#{node[:osmosis][:version]}.zip" osmosis_directory = "/opt/osmosis-#{node[:osmosis][:version]}" Dir.glob("/var/cache/chef/osmosis-*.zip").each do |zip| - if zip != "/var/cache/chef/#{osmosis_package}" - file zip do - action :delete - backup false - end + next if zip == "/var/cache/chef/#{osmosis_package}" + + file zip do + action :delete + backup false end end