diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index c5c7e76fc..2bac8f6b2 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 41ddd2e5d20a95fc9ee8344a9cdd57f85dfe47b1 + revision: f1c903b899df38ff8e5445ae1cd6483fcbafdea7 branch: master specs: omnibus-software (4.0.0) @@ -32,7 +32,7 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.348.0) + aws-partitions (1.349.0) aws-sdk-core (3.104.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb index 0dc8466b6..447593fb4 100644 --- a/omnibus/config/software/more-ruby-cleanup.rb +++ b/omnibus/config/software/more-ruby-cleanup.rb @@ -45,13 +45,21 @@ # find the embedded ruby gems dir and clean it up for globbing target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/gems".tr('\\', "/") files = %w{ + .rspec-tm + .sitearchdir.time *-public_cert.pem + .dockerignore + bootstrap.sh ci + diagrams example examples ext Gemfile.lock + java + patches playbooks + perf rakelib sample samples @@ -60,7 +68,7 @@ warning.txt } - Dir.glob(Dir.glob("#{target_dir}/*/{#{files.join(",")}}")).each do |f| + Dir.glob("#{target_dir}/*/{#{files.join(",")}}").each do |f| puts "Deleting #{f}" FileUtils.rm_rf(f) end @@ -76,7 +84,7 @@ tasks } - Dir.glob(Dir.glob("#{target_dir}/*/{#{files.join(",")}}")).each do |f| + Dir.glob("#{target_dir}/*/{#{files.join(",")}}").each do |f| # don't delete these files if there's a non-empty bin dir in the same dir next if Dir.exist?(File.join(File.dirname(f), "bin")) && !Dir.empty?(File.join(File.dirname(f), "bin")) @@ -89,7 +97,7 @@ # find the embedded ruby gems dir and clean it up for globbing target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/gems".tr('\\', "/") - Dir.glob(Dir.glob("#{target_dir}/*/spec")).each do |f| + Dir.glob("#{target_dir}/*/spec").each do |f| # don't delete these files if we use them in our verify tests unless File.basename(File.expand_path("..", f)).match?(/^(berkshelf|test-kitchen|chef|chef-cli|chef-apply|chefspec)-\d/)