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

caveats: yosemite adjustments

Browse Source 
Closes Homebrew/homebrew#33815
This commit is contained in:
Dominyk Tiller 2014-11-02 09:42:15 +00:00 committed by Mike McQuaid
parent 0b7146f123
commit c6bc9b7e9f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/caveats.rb
View File

@ -115,11 +115,14 @@ class Caveats
# we readlink because this path probably doesn't exist since caveats # we readlink because this path probably doesn't exist since caveats
# occurs before the link step of installation # occurs before the link step of installation
# Yosemite security measures mildly tighter rules:
# https://github.com/Homebrew/homebrew/issues/33815
if !plist_path.file? || !plist_path.symlink? if !plist_path.file? || !plist_path.symlink?
if f.plist_startup if f.plist_startup
s << "To have launchd start #{f.name} at startup:" s << "To have launchd start #{f.name} at startup:"
s << " sudo mkdir -p #{destination}" unless destination_path.directory? s << " sudo mkdir -p #{destination}" unless destination_path.directory?
s << " sudo cp -fv #{f.opt_prefix}/*.plist #{destination}" s << " sudo cp -fv #{f.opt_prefix}/*.plist #{destination}"
s << " sudo chown root #{plist_link}"
else else
s << "To have launchd start #{f.name} at login:" s << "To have launchd start #{f.name} at login:"
s << " mkdir -p #{destination}" unless destination_path.directory? s << " mkdir -p #{destination}" unless destination_path.directory?
@ -137,6 +140,7 @@ class Caveats
s << "To reload #{f.name} after an upgrade:" s << "To reload #{f.name} after an upgrade:"
s << " sudo launchctl unload #{plist_link}" s << " sudo launchctl unload #{plist_link}"
s << " sudo cp -fv #{f.opt_prefix}/*.plist #{destination}" s << " sudo cp -fv #{f.opt_prefix}/*.plist #{destination}"
s << " sudo chown root #{plist_link}"
s << " sudo launchctl load #{plist_link}" s << " sudo launchctl load #{plist_link}"
elsif Kernel.system "/bin/launchctl list #{plist_domain} &>/dev/null" elsif Kernel.system "/bin/launchctl list #{plist_domain} &>/dev/null"
s << "To reload #{f.name} after an upgrade:" s << "To reload #{f.name} after an upgrade:"