From 095d83d10b6763ecc57f3967898113c98b920063 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 22 Dec 2013 13:43:50 -0600 Subject: [PATCH] cleaner: reorganize clean_dir to avoid repeated conditional --- Library/Homebrew/cleaner.rb | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb index bf06398352..5a54f88b06 100644 --- a/Library/Homebrew/cleaner.rb +++ b/Library/Homebrew/cleaner.rb @@ -74,21 +74,17 @@ class Cleaner d.find do |path| path.extend(NoisyPathname) if ARGV.verbose? - if path.directory? - # Stop cleaning this subtree if protected - Find.prune if @f.skip_clean? path - elsif not path.file? - # Sanity? + Find.prune if @f.skip_clean? path + + if path.symlink? or path.directory? next elsif path.extname == '.la' - # *.la files are stupid - path.unlink unless @f.skip_clean? path + path.unlink elsif path == @f.lib+'charset.alias' # Many formulae symlink this file, but it is not strictly needed - path.unlink unless @f.skip_clean? path - elsif not path.symlink? - # Fix permissions - clean_file_permissions(path) unless @f.skip_clean? path + path.unlink + else + clean_file_permissions(path) end end end