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

caveats: use Formula#full_name

Browse Source
This commit is contained in:
Xu Cheng 2015-05-27 20:40:32 +08:00
parent d2cd7ffdf2
commit e5f5145773
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/caveats.rb
View File

@ -124,16 +124,16 @@ class Caveats
# https://github.com/Homebrew/homebrew/issues/33815 # 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.full_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}" s << " sudo chown root #{plist_link}"
else else
s << "To have launchd start #{f.name} at login:" s << "To have launchd start #{f.full_name} at login:"
s << " mkdir -p #{destination}" unless destination_path.directory? s << " mkdir -p #{destination}" unless destination_path.directory?
s << " ln -sfv #{f.opt_prefix}/*.plist #{destination}" s << " ln -sfv #{f.opt_prefix}/*.plist #{destination}"
end end
s << "Then to load #{f.name} now:" s << "Then to load #{f.full_name} now:"
if f.plist_startup if f.plist_startup
s << " sudo launchctl load #{plist_link}" s << " sudo launchctl load #{plist_link}"
else else
@ -142,17 +142,17 @@ class Caveats
# For startup plists, we cannot tell whether it's running on launchd, # For startup plists, we cannot tell whether it's running on launchd,
# as it requires for `sudo launchctl list` to get real result. # as it requires for `sudo launchctl list` to get real result.
elsif f.plist_startup elsif f.plist_startup
s << "To reload #{f.name} after an upgrade:" s << "To reload #{f.full_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 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.full_name} after an upgrade:"
s << " launchctl unload #{plist_link}" s << " launchctl unload #{plist_link}"
s << " launchctl load #{plist_link}" s << " launchctl load #{plist_link}"
else else
s << "To load #{f.name}:" s << "To load #{f.full_name}:"
s << " launchctl load #{plist_link}" s << " launchctl load #{plist_link}"
end end