Update Ohai to 16.2.3 and update some comments in omnibus

Signed-off-by: Tim Smith <tsmith@chef.io>

1 files changed, 9 insertions, 2 deletions

diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb
index f5af0501cd..f83e210512 100644
--- a/omnibus/config/software/more-ruby-cleanup.rb
+++ b/omnibus/config/software/more-ruby-cleanup.rb
@@ -24,6 +24,8 @@ license :project_license
 
 source path: "#{project.files_path}/#{name}"
 
+dependency "ruby"
+
 build do
   block "Removing console and setup binaries" do
     Dir.glob("#{install_dir}/embedded/lib/ruby/gems/*/gems/*/bin/{console,setup}").each do |f|
@@ -31,9 +33,14 @@ build do
       FileUtils.rm_rf(f)
     end
   end
-end
 
-build do
+  block "remove any .gitkeep files" do
+    Dir.glob("#{install_dir}/**/{.gitkeep,.keep}").each do |f|
+      puts "Deleting #{f}"
+      File.delete(f)
+    end
+  end
+
   block "Removing additional non-code files from installed gems" do
     # find the embedded ruby gems dir and clean it up for globbing
     target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/gems".tr('\\', "/")