aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-12-05 10:09:14 -0600
committerJack Nagel2013-12-05 12:48:56 -0600
commit975ce057bc88a561d6125c962f89d2d10d099bb6 (patch)
tree0da4b87c06e63fc4dfd3553072b4d8dd5d5731cf /Library
parent5bab5e9b52bd2b8b173f9bf47b0e1bb13648b1c2 (diff)
downloadhomebrew-975ce057bc88a561d6125c962f89d2d10d099bb6.tar.bz2
Run post_install after linking and relocation
Closes #24962.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula_installer.rb17
1 files changed, 11 insertions, 6 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index d8ff6da08..8d4f003d7 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -144,12 +144,6 @@ class FormulaInstaller
build_bottle_postinstall if ARGV.build_bottle?
- begin
- f.post_install
- rescue
- opoo "#{f.name} post_install failed. Rerun with `brew postinstall #{f.name}`."
- end
-
opoo "Nothing was installed to #{f.prefix}" unless f.installed?
end
@@ -314,6 +308,8 @@ class FormulaInstaller
fix_install_names if OS.mac?
+ post_install
+
ohai "Summary" if ARGV.verbose? or show_summary_heading
unless ENV['HOMEBREW_NO_EMOJI']
print "#{ENV['HOMEBREW_INSTALL_BADGE'] || "\xf0\x9f\x8d\xba"} " if MacOS.version >= :lion
@@ -468,6 +464,15 @@ class FormulaInstaller
@show_summary_heading = true
end
+ def post_install
+ f.post_install
+ rescue Exception => e
+ opoo "The post-install step did not complete successfully"
+ puts "You can try again using `brew postinstall #{f.name}`"
+ ohai e, e.backtrace if ARGV.debug?
+ @show_summary_heading = true
+ end
+
def pour
if f.local_bottle_path
downloader = LocalBottleDownloadStrategy.new(f)