Use fileutils to delete files or dirsslim_the_install

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

1 files changed, 17 insertions, 22 deletions

diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb
index c8725fbd1a..6cfb526def 100644
--- a/omnibus/config/software/more-ruby-cleanup.rb
+++ b/omnibus/config/software/more-ruby-cleanup.rb
@@ -73,31 +73,26 @@ build do
       next if File.basename(File.expand_path("..", f)).start_with?("chef-")
 
       puts "Deleting #{f}"
-      if File.directory?(f)
-        # recursively removes files and the dir
-        FileUtils.remove_dir(f)
-      else
-        File.delete(f)
-      end
+      FileUtils.rm_rf(f)
     end
+  end
 
-    block "Removing Gemspec / Rakefile / Gemfile unless there's a bin dir" do
-      # find the embedded ruby gems dir and clean it up for globbing
-      target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/gems".tr('\\', "/")
-      files = %w{
-        *.gemspec
-        Gemfile
-        Rakefile
-        tasks/*.rake
-      }
+  block "Removing Gemspec / Rakefile / Gemfile unless there's a bin dir" do
+    # find the embedded ruby gems dir and clean it up for globbing
+    target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/gems".tr('\\', "/")
+    files = %w{
+      *.gemspec
+      Gemfile
+      Rakefile
+      tasks/*.rake
+    }
 
-      Dir.glob(Dir.glob("#{target_dir}/*/{#{files.join(",")}}")).each do |f|
-        # don't delete these files if there's a bin dir in the same dir
-        unless Dir.exist?(File.join(File.dirname(f), "bin"))
-          puts "Deleting #{f}"
-          File.delete(f)
-        end
+    Dir.glob(Dir.glob("#{target_dir}/*/{#{files.join(",")}}")).each do |f|
+      # don't delete these files if there's a bin dir in the same dir
+      unless Dir.exist?(File.join(File.dirname(f), "bin"))
+        puts "Deleting #{f}"
+        File.delete(f)
       end
     end
   end
-end
+end
\ No newline at end of file