From 3d69e5ab7b4d8e3f97fe9fea102a4c53687de3e6 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 24 Jun 2014 19:04:52 -0500 Subject: Rename Keg#fname to Keg#name --- Library/Homebrew/cmd/link.rb | 6 +++--- Library/Homebrew/cmd/uninstall.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Library/Homebrew/cmd') diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb index bd36ec25a..4a83a2ca1 100644 --- a/Library/Homebrew/cmd/link.rb +++ b/Library/Homebrew/cmd/link.rb @@ -12,10 +12,10 @@ module Homebrew ARGV.kegs.each do |keg| if keg.linked? opoo "Already linked: #{keg}" - puts "To relink: brew unlink #{keg.fname} && brew link #{keg.fname}" + puts "To relink: brew unlink #{keg.name} && brew link #{keg.name}" next - elsif keg_only?(keg.fname) && !ARGV.force? - opoo "#{keg.fname} is keg-only and must be linked with --force" + elsif keg_only?(keg.name) && !ARGV.force? + opoo "#{keg.name} is keg-only and must be linked with --force" puts "Note that doing so can interfere with building software." next elsif mode.dry_run && mode.overwrite diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb index 91551c442..fa25486ef 100644 --- a/Library/Homebrew/cmd/uninstall.rb +++ b/Library/Homebrew/cmd/uninstall.rb @@ -11,7 +11,7 @@ module Homebrew puts "Uninstalling #{keg}..." keg.unlink keg.uninstall - rm_pin keg.fname + rm_pin keg.name end end else -- cgit v1.2.3