diff options
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 23 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/update-report.rb | 4 |
2 files changed, 6 insertions, 21 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 0867e893a..16639c4aa 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -142,6 +142,7 @@ module Homebrew msg = "#{current.full_name}-#{current.installed_version} already installed" unless current.linked_keg.symlink? || current.keg_only? msg << ", it's just not linked" + puts "You can link formula with `brew link #{f}`" end opoo msg elsif f.migration_needed? && !ARGV.force? @@ -222,25 +223,12 @@ module Homebrew def check_development_tools checks = Diagnostic::Checks.new - all_development_tools_checks = checks.development_tools_checks + - checks.fatal_development_tools_checks - all_development_tools_checks.each do |check| + checks.fatal_development_tools_checks.each do |check| out = checks.send(check) next if out.nil? - if checks.fatal_development_tools_checks.include?(check) - odie out - else - opoo out - end + ofail out end - end - - def check_macports - return if MacOS.macports_or_fink.empty? - - opoo "It appears you have MacPorts or Fink installed." - puts "Software installed with other package managers causes known problems for" - puts "Homebrew. If a formula fails to build, uninstall MacPorts/Fink and try again." + exit 1 if Homebrew.failed? end def check_cellar @@ -282,8 +270,5 @@ module Homebrew # another formula. In that case, don't generate an error, just move on. rescue CannotInstallFormulaError => e ofail e.message - rescue BuildError - check_macports - raise end end diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 72dcc293d..9d096c4cb 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -415,7 +415,7 @@ class Reporter # This means it is a Cask if report[:DC].include? full_name - next unless (HOMEBREW_REPOSITORY/"Caskroom"/name).exist? + next unless (HOMEBREW_PREFIX/"Caskroom"/name).exist? new_tap = Tap.fetch(new_tap_name) new_tap.install unless new_tap.installed? ohai "#{name} has been moved to Homebrew.", <<-EOS.undent @@ -442,7 +442,7 @@ class Reporter new_tap = Tap.fetch(new_tap_name) # For formulae migrated to cask: Auto-install cask or provide install instructions. if new_tap_name == "caskroom/cask" - if new_tap.installed? && (HOMEBREW_REPOSITORY/"Caskroom").directory? + if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory? ohai "#{name} has been moved to Homebrew-Cask." ohai "brew uninstall --force #{name}" system HOMEBREW_BREW_FILE, "uninstall", "--force", name |