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

formula_installer.rb: Call link before check_PATH

Browse Source 
Otherwise, for formula that making the very first install into `sbin`, the
following line will fail with a critical error:

    bin = (HOMEBREW_PREFIX/bin.basename).realpath.to_s

Because `sbin` will not exist until after `link` runs.

This isn't very clean as it moves `check_PATH` away from the other checks in
`caveats`, but I couldn't think of a better hotfix that did not require a bit
of code shuffling and re-writing.
This commit is contained in:
Charlie Sharpsteen 2011-09-13 19:40:51 -07:00
parent 5790935b12
commit 555b9d149f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula_installer.rb
View File

@ -66,7 +66,6 @@ class FormulaInstaller
ohai 'Caveats', f.keg_only_text ohai 'Caveats', f.keg_only_text
@show_summary_heading = true @show_summary_heading = true
else else
check_PATH
check_manpages check_manpages
check_infopages check_infopages
check_jars check_jars
@ -77,7 +76,10 @@ class FormulaInstaller
def finish def finish
ohai 'Finishing up' if ARGV.verbose? ohai 'Finishing up' if ARGV.verbose?
link unless f.keg_only? unless f.keg_only?
link
check_PATH
end
fix_install_names fix_install_names
ohai "Summary" if ARGV.verbose? or show_summary_heading ohai "Summary" if ARGV.verbose? or show_summary_heading