aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd/upgrade.rb
diff options
context:
space:
mode:
authorAdam Vandenberg2014-05-26 11:19:00 -0700
committerAdam Vandenberg2014-05-26 18:33:31 -0700
commite2ed77e058060ec6da080ed492ba591e09abbf0e (patch)
treec64ec9da7f46d9def0f67b64c0e84e0225ccab3a /Library/Homebrew/cmd/upgrade.rb
parentd31db8b415ab26798dc71b77009c3a0149223de0 (diff)
downloadhomebrew-e2ed77e058060ec6da080ed492ba591e09abbf0e.tar.bz2
pluralize formulae in tap/untap
Closes #28560.
Diffstat (limited to 'Library/Homebrew/cmd/upgrade.rb')
-rw-r--r--Library/Homebrew/cmd/upgrade.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 205de517d..1f9330beb 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -1,12 +1,6 @@
require 'cmd/install'
require 'cmd/outdated'
-class Fixnum
- def plural_s
- if self != 1 then "s" else "" end
- end
-end
-
module Homebrew extend self
def upgrade
Homebrew.perform_preinstall_checks
@@ -35,14 +29,14 @@ module Homebrew extend self
end
unless outdated.empty?
- oh1 "Upgrading #{outdated.length} outdated package#{outdated.length.plural_s}, with result:"
+ oh1 "Upgrading #{outdated.length} outdated package#{plural(outdated.length)}, with result:"
puts outdated.map{ |f| "#{f.name} #{f.pkg_version}" } * ", "
else
oh1 "No packages to upgrade"
end
unless upgrade_pinned? || pinned.empty?
- oh1 "Not upgrading #{pinned.length} pinned package#{pinned.length.plural_s}:"
+ oh1 "Not upgrading #{pinned.length} pinned package#{plural(pinned.length)}:"
puts pinned.map{ |f| "#{f.name} #{f.pkg_version}" } * ", "
end