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

fix_install_names: extract change_install_name

Browse Source
This commit is contained in:
Jack Nagel 2013-12-04 22:37:57 -06:00
parent 1d31200ad2
commit e7633d876e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/keg_fix_install_names.rb
View File

@ -8,7 +8,7 @@ class Keg
bad_names.each do |bad_name| bad_names.each do |bad_name|
new_name = fixed_name(file, bad_name) new_name = fixed_name(file, bad_name)
unless new_name == bad_name unless new_name == bad_name
install_name_tool("-change", bad_name, new_name, file) change_install_name(bad_name, new_name, file)
end end
end end
end end
@ -25,7 +25,7 @@ class Keg
old_prefix_names.each do |old_prefix_name| old_prefix_names.each do |old_prefix_name|
new_prefix_name = old_prefix_name.to_s.gsub old_prefix, new_prefix new_prefix_name = old_prefix_name.to_s.gsub old_prefix, new_prefix
install_name_tool("-change", old_prefix_name, new_prefix_name, file) change_install_name(old_prefix_name, new_prefix_name, file)
end end
end end
end end
@ -34,7 +34,7 @@ class Keg
file.ensure_writable do file.ensure_writable do
old_cellar_names.each do |old_cellar_name| old_cellar_names.each do |old_cellar_name|
new_cellar_name = old_cellar_name.to_s.gsub old_cellar, new_cellar new_cellar_name = old_cellar_name.to_s.gsub old_cellar, new_cellar
install_name_tool("-change", old_cellar_name, new_cellar_name, file) change_install_name(old_cellar_name, new_cellar_name, file)
end end
end end
end end
@ -56,6 +56,10 @@ class Keg
end end
end end
def change_install_name(old, new, file)
install_name_tool("-change", old, new, file)
end
# Given old == "/usr/local/Cellar" and new == "/opt/homebrew/Cellar", # Given old == "/usr/local/Cellar" and new == "/opt/homebrew/Cellar",
# then update lines of the form # then update lines of the form
# some_variable=/usr/local/Cellar/foo/1.0/lib # some_variable=/usr/local/Cellar/foo/1.0/lib