admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #14601 from apainintheneck/stop-double-warning-in-edit

Browse Source 
cmd/edit: stop double warning
This commit is contained in:
Mike McQuaid 2023-02-12 12:01:06 +00:00 committed by GitHub
commit f4f22bc937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dev-cmd/edit.rb
View File

@ -45,7 +45,7 @@ module Homebrew
paths = if args.named.empty? paths = if args.named.empty?
# Sublime requires opting into the project editing path, # Sublime requires opting into the project editing path,
# as opposed to VS Code which will infer from the .vscode path # as opposed to VS Code which will infer from the .vscode path
if which_editor == "subl" if which_editor(silent: true) == "subl"
["--project", "#{HOMEBREW_REPOSITORY}/.sublime/homebrew.sublime-project"] ["--project", "#{HOMEBREW_REPOSITORY}/.sublime/homebrew.sublime-project"]
else else
# If no formulae are listed, open the project root in an editor. # If no formulae are listed, open the project root in an editor.

4
Library/Homebrew/utils.rb
View File

@ -361,7 +361,7 @@ module Kernel
end.compact.uniq end.compact.uniq
end end
def which_editor def which_editor(silent: false)
editor = Homebrew::EnvConfig.editor editor = Homebrew::EnvConfig.editor
return editor if editor return editor if editor
@ -371,11 +371,13 @@ module Kernel
end end
editor ||= "vim" editor ||= "vim"
unless silent
opoo <<~EOS opoo <<~EOS
Using #{editor} because no editor was set in the environment. Using #{editor} because no editor was set in the environment.
This may change in the future, so we recommend setting EDITOR, This may change in the future, so we recommend setting EDITOR,
or HOMEBREW_EDITOR to your preferred text editor. or HOMEBREW_EDITOR to your preferred text editor.
EOS EOS
end
editor editor
end end