Merge pull request #3778 from yous/cmd-format-formula
Format identifiers in oh1
This commit is contained in:
commit
72aa8f5d45
@ -75,7 +75,7 @@ module Hbc
|
||||
fetch
|
||||
uninstall_existing_cask if @reinstall
|
||||
|
||||
oh1 "Installing Cask #{@cask}"
|
||||
oh1 "Installing Cask #{Formatter.identifier(@cask)}"
|
||||
stage
|
||||
install_artifacts
|
||||
enable_accessibility_access
|
||||
@ -348,7 +348,7 @@ module Hbc
|
||||
end
|
||||
|
||||
def uninstall
|
||||
oh1 "Uninstalling Cask #{@cask}"
|
||||
oh1 "Uninstalling Cask #{Formatter.identifier(@cask)}"
|
||||
disable_accessibility_access
|
||||
uninstall_artifacts(clear: true)
|
||||
purge_versioned_files
|
||||
@ -356,7 +356,7 @@ module Hbc
|
||||
end
|
||||
|
||||
def start_upgrade
|
||||
oh1 "Starting upgrade for Cask #{@cask}"
|
||||
oh1 "Starting upgrade for Cask #{Formatter.identifier(@cask)}"
|
||||
|
||||
disable_accessibility_access
|
||||
uninstall_artifacts
|
||||
|
||||
@ -42,7 +42,7 @@ module Homebrew
|
||||
fi.link_keg ||= keg_was_linked if keg_had_linked_opt
|
||||
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.finish
|
||||
|
||||
@ -36,7 +36,7 @@ module Homebrew
|
||||
rm_rf stage_dir
|
||||
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
|
||||
f.brew do
|
||||
|
||||
@ -127,7 +127,7 @@ module Homebrew
|
||||
end
|
||||
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
|
||||
# possible for the existing build to interfere with the build we are about to
|
||||
|
||||
@ -50,7 +50,7 @@ module Utils
|
||||
# we cannot install brewed git if homebrew/core is unavailable.
|
||||
if CoreTap.instance.installed?
|
||||
begin
|
||||
oh1 "Installing git"
|
||||
oh1 "Installing #{Formatter.identifier("git")}"
|
||||
safe_system HOMEBREW_BREW_FILE, "install", "git"
|
||||
rescue
|
||||
raise "Git is unavailable"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user