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

Fix startup plist instructions.

Browse Source 
Closes Homebrew/homebrew#16369.
This commit is contained in:
Mike McQuaid 2012-12-03 17:09:49 +00:00
parent 21dfef7ec2
commit 9342a42386
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Library/Homebrew/formula_installer.rb
View File

@ -175,16 +175,12 @@ class FormulaInstaller
end end
if f.plist or keg.plist_installed? if f.plist or keg.plist_installed?
if f.plist_startup and false destination = f.plist_startup ? '/Library/LaunchDaemons' \
destination = '/Library/LaunchDaemons' : '~/Library/LaunchAgents'
else
destination = '~/Library/LaunchAgents'
end
plist_filename = f.plist_path.basename plist_filename = f.plist_path.basename
plist_link = "#{destination}/#{plist_filename}" plist_link = "#{destination}/#{plist_filename}"
plist_domain = f.plist_path.basename('.plist') plist_domain = f.plist_path.basename('.plist')
launchctl_load = "launchctl load -w #{plist_link}"
destination_path = Pathname.new File.expand_path destination destination_path = Pathname.new File.expand_path destination
plist_path = destination_path/plist_filename plist_path = destination_path/plist_filename
s = [] s = []
@ -192,22 +188,42 @@ class FormulaInstaller
# 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
if not (plist_path).file? and not (plist_path).symlink? if not (plist_path).file? and not (plist_path).symlink?
if f.plist_startup
s << "To have launchd start #{f.name} at startup:"
s << " sudo mkdir -p #{destination}" unless destination_path.directory?
s << " sudo cp -fv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
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?
s << " ln -sfv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}" #sudo s << " ln -sfv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
end
s << "Then to load #{f.name} now:" s << "Then to load #{f.name} now:"
s << " #{launchctl_load}" if f.plist_startup
s << " sudo launchctl load #{plist_link}"
else
s << " launchctl load #{plist_link}"
end
if f.plist_manual if f.plist_manual
s << "Or, if you don't want/need launchctl, you can just run:" s << "Or, if you don't want/need launchctl, you can just run:"
s << " #{f.plist_manual}" s << " #{f.plist_manual}"
end end
elsif Kernel.system "/bin/launchctl list #{plist_domain} &>/dev/null" elsif Kernel.system "/bin/launchctl list #{plist_domain} &>/dev/null"
s << "You should reload #{f.name}:" s << "You should reload #{f.name}:"
s << " launchctl unload -w #{plist_link}" if f.plist_startup
s << " #{launchctl_load}" s << " sudo launchctl unload #{plist_link}"
s << " sudo cp -fv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
s << " sudo launchctl load #{plist_link}"
else
s << " launchctl unload #{plist_link}"
s << " launchctl load #{plist_link}"
end
else else
s << "To load #{f.name}:" s << "To load #{f.name}:"
s << " #{launchctl_load}" if f.plist_startup
s << " sudo launchctl load #{plist_link}"
else
s << " launchctl load #{plist_link}"
end
end end
ohai 'Caveats', s ohai 'Caveats', s