admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7956 from MikeMcQuaid/keg-unlink-more-aliases

Browse Source 
keg: unlink alias linkedkegs.
This commit is contained in:
Mike McQuaid 2020-07-09 14:54:09 +01:00 committed by GitHub
commit 50d12ce900
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Library/Homebrew/keg.rb
View File

@ -255,6 +255,7 @@ class Keg
def remove_old_aliases def remove_old_aliases
opt = opt_record.parent opt = opt_record.parent
linkedkegs = linked_keg_record.parent
tap = begin tap = begin
to_formula.tap to_formula.tap
@ -272,11 +273,18 @@ class Keg
# versioned aliases are handled below # versioned aliases are handled below
next if a.match?(/.+@./) next if a.match?(/.+@./)
alias_symlink = opt/a alias_opt_symlink = opt/a
if alias_symlink.symlink? && alias_symlink.exist? if alias_opt_symlink.symlink? && alias_opt_symlink.exist?
alias_symlink.delete if alias_symlink.realpath == opt_record.realpath alias_opt_symlink.delete if alias_opt_symlink.realpath == opt_record.realpath
elsif alias_symlink.symlink? || alias_symlink.exist? elsif alias_opt_symlink.symlink? || alias_opt_symlink.exist?
alias_symlink.delete alias_opt_symlink.delete
end
alias_linkedkegs_symlink = linkedkegs/a
if alias_linkedkegs_symlink.symlink? && alias_linkedkegs_symlink.exist?
alias_linkedkegs_symlink.delete if alias_linkedkegs_symlink.realpath == linked_keg_record.realpath
elsif alias_linkedkegs_symlink.symlink? || alias_linkedkegs_symlink.exist?
alias_linkedkegs_symlink.delete
end end
end end
@ -284,12 +292,15 @@ class Keg
a = a.basename.to_s a = a.basename.to_s
next if aliases.include?(a) next if aliases.include?(a)
alias_symlink = opt/a alias_opt_symlink = opt/a
if alias_symlink.symlink? && alias_symlink.exist? if alias_opt_symlink.symlink? && alias_opt_symlink.exist?
next if rack != alias_symlink.realpath.parent alias_opt_symlink.delete if rack == alias_opt_symlink.realpath.parent
end end
alias_symlink.delete alias_linkedkegs_symlink = linkedkegs/a
if alias_linkedkegs_symlink.symlink? && alias_linkedkegs_symlink.exist?
alias_linkedkegs_symlink.delete if rack == alias_linkedkegs_symlink.realpath.parent
end
end end
end end