mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

keg: general cleanup.

Browse Source 
Some refactoring while doing #7956.
This commit is contained in:
Mike McQuaid 2020-07-09 14:21:09 +01:00
parent d5123743b6
commit dfbc09c12f
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/keg.rb
View File

@ -195,7 +195,7 @@ class Keg
def initialize(path) def initialize(path)
path = path.resolved_path if path.to_s.start_with?("#{HOMEBREW_PREFIX}/opt/") path = path.resolved_path if path.to_s.start_with?("#{HOMEBREW_PREFIX}/opt/")
raise "#{path} is not a valid keg" unless path.parent.parent.realpath == HOMEBREW_CELLAR.realpath raise "#{path} is not a valid keg" if path.parent.parent.realpath != HOMEBREW_CELLAR.realpath
raise "#{path} is not a directory" unless path.directory? raise "#{path} is not a directory" unless path.directory?
@path = path @path = path
@ -322,9 +322,9 @@ class Keg
dirs = [] dirs = []
KEG_LINK_DIRECTORIES.map { |d| path/d }.each do |dir| keg_directories = KEG_LINK_DIRECTORIES.map { |d| path/d }
next unless dir.exist? .select(&:exist?)
keg_directories.each do |dir|
dir.find do |src| dir.find do |src|
dst = HOMEBREW_PREFIX + src.relative_path_from(path) dst = HOMEBREW_PREFIX + src.relative_path_from(path)
dst.extend(ObserverPathnameExtension) dst.extend(ObserverPathnameExtension)
@ -332,7 +332,8 @@ class Keg
dirs << dst if dst.directory? && !dst.symlink? dirs << dst if dst.directory? && !dst.symlink?
# check whether the file to be unlinked is from the current keg first # check whether the file to be unlinked is from the current keg first
next unless dst.symlink? && src == dst.resolved_path next unless dst.symlink?
next if src != dst.resolved_path
if mode.dry_run if mode.dry_run
puts dst puts dst
@ -509,7 +510,7 @@ class Keg
def remove_oldname_opt_record def remove_oldname_opt_record
return unless oldname_opt_record return unless oldname_opt_record
return unless oldname_opt_record.resolved_path == path return if oldname_opt_record.resolved_path != path
@oldname_opt_record.unlink @oldname_opt_record.unlink
@oldname_opt_record.parent.rmdir_if_possible @oldname_opt_record.parent.rmdir_if_possible