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

plist_caveats: remove launchctl list as it requires sudo for root services

Browse Source
This commit is contained in:
Xu Cheng 2014-07-03 19:28:09 +08:00 committed by Mike McQuaid
parent 369de0a05d
commit ddf22735db
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Library/Homebrew/caveats.rb
View File

@ -104,33 +104,30 @@ class Caveats
else else
s << " launchctl load #{plist_link}" s << " launchctl load #{plist_link}"
end end
if f.plist_manual else
s << "Or, if you don't want/need launchctl, you can just run:"
s << " #{f.plist_manual}"
end
elsif Kernel.system "/bin/launchctl list #{plist_domain} &>/dev/null"
s << "To reload #{f.name} after an upgrade:"
if f.plist_startup if f.plist_startup
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 launchctl load #{plist_link}" s << " sudo launchctl load #{plist_link}"
else else
s << " launchctl unload #{plist_link}" if Kernel.system "/bin/launchctl list #{plist_domain} &>/dev/null"
s << " launchctl load #{plist_link}" s << "To reload #{f.name} after an upgrade:"
end s << " launchctl unload #{plist_link}"
else s << " launchctl load #{plist_link}"
s << "To load #{f.name}:" else
if f.plist_startup s << "To load #{f.name}:"
s << " sudo launchctl load #{plist_link}" s << " launchctl load #{plist_link}"
else end
s << " launchctl load #{plist_link}"
end
if f.plist_manual
s << "Or, if you don't want/need launchctl, you can just run:"
s << " #{f.plist_manual}"
end end
end end
s << '' << "WARNING: launchctl will fail when run under tmux." if ENV['TMUX']
if f.plist_manual
s << "Or, if you don't want/need launchctl, you can just run:"
s << " #{f.plist_manual}"
end
s << "" << "WARNING: launchctl will fail when run under tmux." if ENV['TMUX']
end end
s.join("\n") unless s.empty? s.join("\n") unless s.empty?
end end