diff options
| author | Jack Nagel | 2013-12-14 09:35:58 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-14 09:35:58 -0600 |
| commit | 3662a2765de7ca27cd6c98ce50c98435a3e25f77 (patch) | |
| tree | 6fbc246d1a1cc93d508497ee42df7a2419c3fc92 /Library/Homebrew | |
| parent | f6979cccb2eb2a2bb2d2d011c6c3d29c58aab0d1 (diff) | |
| download | brew-3662a2765de7ca27cd6c98ce50c98435a3e25f77.tar.bz2 | |
keg: combine loops in relocate_install_names
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/keg_fix_install_names.rb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Library/Homebrew/keg_fix_install_names.rb b/Library/Homebrew/keg_fix_install_names.rb index eefa58f2e..e91356ffd 100644 --- a/Library/Homebrew/keg_fix_install_names.rb +++ b/Library/Homebrew/keg_fix_install_names.rb @@ -28,16 +28,14 @@ class Keg change_dylib_id(id, file) end - each_install_name_for(file) do |old_cellar_name| - next unless old_cellar_name.start_with? old_cellar - new_cellar_name = old_cellar_name.sub(old_cellar, new_cellar) - change_install_name(old_cellar_name, new_cellar_name, file) - end - - each_install_name_for(file) do |old_prefix_name| - next unless old_prefix_name.start_with? old_prefix - new_prefix_name = old_prefix_name.sub(old_prefix, new_prefix) - change_install_name(old_prefix_name, new_prefix_name, file) + each_install_name_for(file) do |old_name| + if old_name.start_with? old_cellar + new_name = old_name.sub(old_cellar, new_cellar) + elsif old_name.start_with? old_prefix + new_name = old_name.sub(old_prefix, new_prefix) + end + + change_install_name(old_name, new_name, file) if new_name end end end |
