inline this method
This commit is contained in:
parent
88865416e9
commit
a78b906389
@ -64,24 +64,7 @@ class Cleaner
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Set permissions for executables and non-executables
|
# Clean a single folder (non-recursively)
|
||||||
def clean_file_permissions path
|
|
||||||
perms = if path.mach_o_executable? || path.text_executable?
|
|
||||||
0555
|
|
||||||
else
|
|
||||||
0444
|
|
||||||
end
|
|
||||||
if ARGV.debug?
|
|
||||||
old_perms = path.stat.mode & 0777
|
|
||||||
if perms != old_perms
|
|
||||||
puts "Fixing #{path} permissions from #{old_perms.to_s(8)} to #{perms.to_s(8)}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
path.chmod perms
|
|
||||||
end
|
|
||||||
|
|
||||||
# Removes .la files and fixes file permissions for a directory tree, keeping
|
|
||||||
# existing files and permissions if instructed to by the formula
|
|
||||||
def clean_dir d
|
def clean_dir d
|
||||||
d.find do |path|
|
d.find do |path|
|
||||||
path.extend(ObserverPathnameExtension)
|
path.extend(ObserverPathnameExtension)
|
||||||
@ -93,7 +76,19 @@ class Cleaner
|
|||||||
elsif path.extname == '.la'
|
elsif path.extname == '.la'
|
||||||
path.unlink
|
path.unlink
|
||||||
else
|
else
|
||||||
clean_file_permissions(path)
|
# Set permissions for executables and non-executables
|
||||||
|
perms = if path.mach_o_executable? || path.text_executable?
|
||||||
|
0555
|
||||||
|
else
|
||||||
|
0444
|
||||||
|
end
|
||||||
|
if ARGV.debug?
|
||||||
|
old_perms = path.stat.mode & 0777
|
||||||
|
if perms != old_perms
|
||||||
|
puts "Fixing #{path} permissions from #{old_perms.to_s(8)} to #{perms.to_s(8)}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
path.chmod perms
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user