Merge pull request #2682 from MikeMcQuaid/improve-installed-messaging
Improve some `brew install` messaging.
This commit is contained in:
Mike McQuaid
GitHub
commit
c2cb2c7868
@ -146,8 +146,17 @@ module Homebrew
|
||||
# linked to opt, because installing without any warnings can break
|
||||
# dependencies. Therefore before performing other checks we need to be
|
||||
# sure --force flag is passed.
|
||||
opoo "#{f.full_name} is a keg-only and another version is linked to opt."
|
||||
puts "Use `brew install --force` if you want to install this version"
|
||||
if f.outdated?
|
||||
optlinked_version = Keg.for(f.opt_prefix).version
|
||||
onoe <<-EOS.undent
|
||||
#{f.full_name} #{optlinked_version} is already installed
|
||||
To upgrade to #{f.version}, run `brew upgrade #{f.name}`
|
||||
EOS
|
||||
else
|
||||
opoo <<-EOS.undent
|
||||
#{f.full_name} #{f.pkg_version} is already installed
|
||||
EOS
|
||||
end
|
||||
elsif (ARGV.build_head? && new_head_installed) || prefix_installed
|
||||
# After we're sure that --force flag is passed for linked to opt
|
||||
# keg-only we need to be sure that the version we're attempting to
|
||||
@ -159,30 +168,38 @@ module Homebrew
|
||||
f.pkg_version
|
||||
end
|
||||
|
||||
msg = "#{f.full_name}-#{installed_version} already installed"
|
||||
msg = "#{f.full_name} #{installed_version} is already installed"
|
||||
linked_not_equals_installed = f.linked_version != installed_version
|
||||
if f.linked? && linked_not_equals_installed
|
||||
msg << ", however linked version is #{f.linked_version}"
|
||||
opoo msg
|
||||
puts "You can use `brew switch #{f} #{installed_version}` to link this version."
|
||||
msg = <<-EOS.undent
|
||||
#{msg}
|
||||
The currently linked version is #{f.linked_version}
|
||||
You can use `brew switch #{f} #{installed_version}` to link this version.
|
||||
EOS
|
||||
elsif !f.linked? || f.keg_only?
|
||||
msg << ", it's just not linked."
|
||||
opoo msg
|
||||
else
|
||||
opoo msg
|
||||
msg = <<-EOS.undent
|
||||
#{msg}, it's just not linked.
|
||||
You can use `brew link #{f}` to link this version.
|
||||
EOS
|
||||
end
|
||||
opoo msg
|
||||
elsif !f.any_version_installed? && old_formula = f.old_installed_formulae.first
|
||||
msg = "#{old_formula.full_name}-#{old_formula.installed_version} already installed"
|
||||
msg = "#{old_formula.full_name} #{old_formula.installed_version} already installed"
|
||||
if !old_formula.linked? && !old_formula.keg_only?
|
||||
msg << ", it's just not linked."
|
||||
msg = <<-EOS.undent
|
||||
#{msg}, it's just not linked.
|
||||
You can use `brew link #{old_formula.full_name}` to link this version.
|
||||
EOS
|
||||
end
|
||||
opoo msg
|
||||
elsif f.migration_needed? && !ARGV.force?
|
||||
# Check if the formula we try to install is the same as installed
|
||||
# but not migrated one. If --force passed then install anyway.
|
||||
opoo "#{f.oldname} already installed, it's just not migrated"
|
||||
puts "You can migrate formula with `brew migrate #{f}`"
|
||||
puts "Or you can force install it with `brew install #{f} --force`"
|
||||
opoo <<-EOS.undent
|
||||
#{f.oldname} already installed, it's just not migrated
|
||||
You can migrate formula with `brew migrate #{f}`
|
||||
Or you can force install it with `brew install #{f} --force`
|
||||
EOS
|
||||
else
|
||||
# If none of the above is true and the formula is linked, then
|
||||
# FormulaInstaller will handle this case.
|
||||
|
||||
@ -325,7 +325,7 @@ class FormulaConflictError < RuntimeError
|
||||
|
||||
def message
|
||||
message = []
|
||||
message << "Cannot install #{formula.full_name} because conflicting formulae are installed.\n"
|
||||
message << "Cannot install #{formula.full_name} because conflicting formulae are installed."
|
||||
message.concat conflicts.map { |c| conflict_message(c) } << ""
|
||||
message << <<-EOS.undent
|
||||
Please `brew unlink #{conflicts.map(&:name)*" "}` before continuing.
|
||||
|
||||
@ -1588,7 +1588,7 @@ class Formula
|
||||
"revision" => revision,
|
||||
"version_scheme" => version_scheme,
|
||||
"installed" => [],
|
||||
"linked_keg" => (linked_keg.resolved_path.basename.to_s if linked_keg.exist?),
|
||||
"linked_keg" => (linked_version.to_s if linked_keg.exist?),
|
||||
"pinned" => pinned?,
|
||||
"outdated" => outdated?,
|
||||
"keg_only" => keg_only?,
|
||||
|
||||
@ -218,7 +218,7 @@ class FormulaInstaller
|
||||
# relink the active keg if possible (because it is slow).
|
||||
if formula.linked_keg.directory?
|
||||
message = <<-EOS.undent
|
||||
#{formula.name} #{formula.linked_keg.resolved_path.basename} is already installed
|
||||
#{formula.name} #{formula.linked_version} is already installed
|
||||
EOS
|
||||
message += if formula.outdated? && !formula.head?
|
||||
<<-EOS.undent
|
||||
|
||||
@ -23,7 +23,7 @@ describe "brew install", :integration_test do
|
||||
.and be_a_success
|
||||
|
||||
expect { brew "install", "testball1" }
|
||||
.to output(/testball1\-0\.1 already installed/).to_stderr
|
||||
.to output(/testball1\ 0\.1 is already installed/).to_stderr
|
||||
.and not_to_output.to_stdout
|
||||
.and be_a_success
|
||||
|
||||
@ -51,7 +51,7 @@ describe "brew install", :integration_test do
|
||||
install_and_rename_coretap_formula "testball1", "testball2"
|
||||
expect { brew "install", "testball2" }
|
||||
.to output(/testball1 already installed, it's just not migrated/).to_stderr
|
||||
.and output(/You can migrate formula with `brew migrate testball2`/).to_stdout
|
||||
.and not_to_output.to_stdout
|
||||
.and be_a_success
|
||||
end
|
||||
|
||||
@ -106,8 +106,8 @@ describe "brew install", :integration_test do
|
||||
end
|
||||
|
||||
expect { brew "install", "testball1" }
|
||||
.to output(/already installed, however linked version is/).to_stderr
|
||||
.and output(/`brew switch testball1 2.0`/).to_stdout
|
||||
.to output(/2.0 is already installed/).to_stderr
|
||||
.and not_to_output.to_stdout
|
||||
.and be_a_success
|
||||
|
||||
expect { brew "unlink", "testball1" }
|
||||
@ -141,8 +141,8 @@ describe "brew install", :integration_test do
|
||||
EOS
|
||||
|
||||
expect { brew "install", "testball1" }
|
||||
.to output(/keg-only and another version is linked to opt/).to_stderr
|
||||
.and output(/Use `brew install --force`/).to_stdout
|
||||
.to output(/testball1 1.0 is already installed/).to_stderr
|
||||
.and not_to_output.to_stdout
|
||||
.and be_a_success
|
||||
|
||||
expect { brew "install", "testball1", "--force" }
|
||||
@ -185,7 +185,7 @@ describe "brew install", :integration_test do
|
||||
.and be_a_success
|
||||
|
||||
expect { brew "install", "testball1", "--HEAD", "--ignore-dependencies" }
|
||||
.to output(/testball1\-HEAD\-d5eb689 already installed/).to_stderr
|
||||
.to output(/testball1 HEAD\-d5eb689 is already installed/).to_stderr
|
||||
.and not_to_output.to_stdout
|
||||
.and be_a_success
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user