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

Merge pull request #2528 from MikeMcQuaid/which_editor_fixes

Browse Source 
utils: fix which_editor.
This commit is contained in:
Mike McQuaid 2017-04-22 18:44:37 +01:00 committed by GitHub
commit 671de2acc6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/utils.rb
View File

@ -320,15 +320,15 @@ def which_all(cmd, path = ENV["PATH"])
end end
def which_editor def which_editor
editor = ENV.values_at("HOMEBREW_EDITOR", "VISUAL").compact.first editor = ENV.values_at("HOMEBREW_EDITOR", "VISUAL").compact.reject(&:empty?).first
return which(editor, ENV["HOMEBREW_PATH"]) unless editor.nil? return which(editor, ENV["HOMEBREW_PATH"]) unless editor.nil?
# Find Textmate # Find Textmate
editor = "mate" if which "mate" editor = which("mate", ENV["HOMEBREW_PATH"])
# Find BBEdit / TextWrangler # Find BBEdit / TextWrangler
editor ||= "edit" if which "edit" editor ||= which("edit", ENV["HOMEBREW_PATH"])
# Find vim # Find vim
editor ||= "vim" if which "vim" editor ||= which("vim", ENV["HOMEBREW_PATH"])
# Default to standard vim # Default to standard vim
editor ||= "/usr/bin/vim" editor ||= "/usr/bin/vim"