Merge pull request #3778 from yous/cmd-format-formula

Format identifiers in oh1
This commit is contained in:
Mike McQuaid 2018-02-09 12:01:33 +00:00 committed by GitHub
commit 72aa8f5d45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions

View File

@ -75,7 +75,7 @@ module Hbc
fetch fetch
uninstall_existing_cask if @reinstall uninstall_existing_cask if @reinstall
oh1 "Installing Cask #{@cask}" oh1 "Installing Cask #{Formatter.identifier(@cask)}"
stage stage
install_artifacts install_artifacts
enable_accessibility_access enable_accessibility_access
@ -348,7 +348,7 @@ module Hbc
end end
def uninstall def uninstall
oh1 "Uninstalling Cask #{@cask}" oh1 "Uninstalling Cask #{Formatter.identifier(@cask)}"
disable_accessibility_access disable_accessibility_access
uninstall_artifacts(clear: true) uninstall_artifacts(clear: true)
purge_versioned_files purge_versioned_files
@ -356,7 +356,7 @@ module Hbc
end end
def start_upgrade def start_upgrade
oh1 "Starting upgrade for Cask #{@cask}" oh1 "Starting upgrade for Cask #{Formatter.identifier(@cask)}"
disable_accessibility_access disable_accessibility_access
uninstall_artifacts uninstall_artifacts

View File

@ -42,7 +42,7 @@ module Homebrew
fi.link_keg ||= keg_was_linked if keg_had_linked_opt fi.link_keg ||= keg_was_linked if keg_had_linked_opt
fi.prelude fi.prelude
oh1 "Reinstalling #{f.full_name} #{options.to_a.join " "}" oh1 "Reinstalling #{Formatter.identifier(f.full_name)} #{options.to_a.join " "}"
fi.install fi.install
fi.finish fi.finish

View File

@ -36,7 +36,7 @@ module Homebrew
rm_rf stage_dir rm_rf stage_dir
end end
oh1 "Unpacking #{f.full_name} to: #{stage_dir}" oh1 "Unpacking #{Formatter.identifier(f.full_name)} to: #{stage_dir}"
ENV["VERBOSE"] = "1" # show messages about tar ENV["VERBOSE"] = "1" # show messages about tar
f.brew do f.brew do

View File

@ -127,7 +127,7 @@ module Homebrew
end end
fi.prelude fi.prelude
oh1 "Upgrading #{f.full_specified_name} #{fi.options.to_a.join " "}" oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{fi.options.to_a.join " "}"
# first we unlink the currently active keg for this formula otherwise it is # first we unlink the currently active keg for this formula otherwise it is
# possible for the existing build to interfere with the build we are about to # possible for the existing build to interfere with the build we are about to

View File

@ -50,7 +50,7 @@ module Utils
# we cannot install brewed git if homebrew/core is unavailable. # we cannot install brewed git if homebrew/core is unavailable.
if CoreTap.instance.installed? if CoreTap.instance.installed?
begin begin
oh1 "Installing git" oh1 "Installing #{Formatter.identifier("git")}"
safe_system HOMEBREW_BREW_FILE, "install", "git" safe_system HOMEBREW_BREW_FILE, "install", "git"
rescue rescue
raise "Git is unavailable" raise "Git is unavailable"