From 7d7ca0cb1a7d83fe60ec8b7a0598e8f29d2c526d Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Sun, 4 Dec 2016 21:52:30 +0100
Subject: [PATCH] =?UTF-8?q?Use=20Homebrew=E2=80=99s=20`Emoji`=20class=20in?=
=?UTF-8?q?=20cask=20installer.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Library/Homebrew/cask/lib/hbc/installer.rb | 7 ++-----
Library/Homebrew/cask/test/cask/cli/install_test.rb | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/lib/hbc/installer.rb
index afdaa2ec53..90e5b1e01d 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/lib/hbc/installer.rb
@@ -82,11 +82,8 @@ module Hbc
end
def summary
- s = if MacOS.version >= :lion && !ENV["HOMEBREW_NO_EMOJI"]
- (ENV["HOMEBREW_INSTALL_BADGE"] || "\xf0\x9f\x8d\xba") + " "
- else
- Formatter.headline("Success! ", color: :blue)
- end
+ s = ""
+ s << "#{Emoji.install_badge} " if Emoji.enabled?
s << "#{@cask} was successfully installed!"
end
diff --git a/Library/Homebrew/cask/test/cask/cli/install_test.rb b/Library/Homebrew/cask/test/cask/cli/install_test.rb
index c774f1fb58..eef3f2e5b0 100644
--- a/Library/Homebrew/cask/test/cask/cli/install_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/install_test.rb
@@ -39,7 +39,7 @@ describe Hbc::CLI::Install do
lambda {
Hbc::CLI::Install.run("local-transmission", "--force")
- }.must_output(/==> Success! local-transmission was successfully installed!/)
+ }.must_output(/local-transmission was successfully installed!/)
end
it "skips dependencies with --skip-cask-deps" do
--
GitLab