aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cleaner.rb
diff options
context:
space:
mode:
authorBrewTestBot2015-08-03 13:09:07 +0100
committerMike McQuaid2015-08-03 13:22:35 +0100
commit13d544e11e92ba8ea3788723432046f8dfe4adf9 (patch)
treee6da18436d9ce956e6fbe80e3185c67cf3b58808 /Library/Homebrew/cleaner.rb
parent3b68215be793774fafd9ce124a2065f5968f50e5 (diff)
downloadbrew-13d544e11e92ba8ea3788723432046f8dfe4adf9.tar.bz2
Core files style updates.
Closes Homebrew/homebrew#42354. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/cleaner.rb')
-rw-r--r--Library/Homebrew/cleaner.rb30
1 files changed, 14 insertions, 16 deletions
diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index 02ff9c5cd..dae9dbc6c 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -5,9 +5,8 @@
# * sets permissions on executables
# * removes unresolved symlinks
class Cleaner
-
# Create a cleaner for the given formula
- def initialize f
+ def initialize(f)
@f = f
end
@@ -17,13 +16,13 @@ class Cleaner
# Many formulae include 'lib/charset.alias', but it is not strictly needed
# and will conflict if more than one formula provides it
- observe_file_removal @f.lib/'charset.alias'
+ observe_file_removal @f.lib/"charset.alias"
- [@f.bin, @f.sbin, @f.lib].select{ |d| d.exist? }.each{ |d| clean_dir d }
+ [@f.bin, @f.sbin, @f.lib].select(&:exist?).each { |d| clean_dir d }
# Get rid of any info 'dir' files, so they don't conflict at the link stage
- info_dir_file = @f.info + 'dir'
- if info_dir_file.file? and not @f.skip_clean? info_dir_file
+ info_dir_file = @f.info + "dir"
+ if info_dir_file.file? and !@f.skip_clean? info_dir_file
observe_file_removal info_dir_file
end
@@ -32,7 +31,7 @@ class Cleaner
private
- def observe_file_removal path
+ def observe_file_removal(path)
path.extend(ObserverPathnameExtension).unlink if path.exist?
end
@@ -43,7 +42,7 @@ class Cleaner
dirs = []
symlinks = []
@f.prefix.find do |path|
- if path == @f.libexec or @f.skip_clean?(path)
+ if path == @f.libexec || @f.skip_clean?(path)
Find.prune
elsif path.symlink?
symlinks << path
@@ -76,23 +75,23 @@ class Cleaner
#
# lib may have a large directory tree (see Erlang for instance), and
# clean_dir applies cleaning rules to the entire tree
- def clean_dir d
+ def clean_dir(d)
d.find do |path|
path.extend(ObserverPathnameExtension)
Find.prune if @f.skip_clean? path
- if path.symlink? or path.directory?
+ if path.symlink? || path.directory?
next
- elsif path.extname == '.la'
+ elsif path.extname == ".la"
path.unlink
else
# Set permissions for executables and non-executables
perms = if path.mach_o_executable? || path.text_executable?
- 0555
- else
- 0444
- end
+ 0555
+ else
+ 0444
+ end
if ARGV.debug?
old_perms = path.stat.mode & 0777
if perms != old_perms
@@ -103,5 +102,4 @@ class Cleaner
end
end
end
-
end