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

Install plists in FormulaInstaller, not build.rb

Browse Source 
Build rb should only build!
This commit is contained in:
Max Howell 2012-09-11 20:57:41 -04:00
parent fe295faffe
commit 523f50862b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/build.rb
View File

@ -146,14 +146,6 @@ def install f
f.prefix.mkpath f.prefix.mkpath
f.install f.install
# Install a plist if one is defined
unless f.startup_plist.nil?
unless f.plist_path.exist?
f.plist_path.write f.startup_plist
f.plist_path.chmod 0644
end
end
# Find and link metafiles # Find and link metafiles
FORMULA_META_FILES.each do |filename| FORMULA_META_FILES.each do |filename|
next if File.directory? filename next if File.directory? filename

9
Library/Homebrew/formula_installer.rb
View File

@ -186,6 +186,7 @@ class FormulaInstaller
check_PATH unless f.keg_only? check_PATH unless f.keg_only?
end end
install_plist
fix_install_names fix_install_names
ohai "Summary" if ARGV.verbose? or show_summary_heading ohai "Summary" if ARGV.verbose? or show_summary_heading
@ -283,6 +284,14 @@ class FormulaInstaller
end end
end end
def install_plist
# Install a plist if one is defined
if f.startup_plist and not f.plist_path.exist?
f.plist_path.write f.startup_plist
f.plist_path.chmod 0644
end
end
def fix_install_names def fix_install_names
Keg.new(f.prefix).fix_install_names Keg.new(f.prefix).fix_install_names
rescue Exception => e rescue Exception => e