utils: fix which_editor.

Handle when there's no editor variable specified or it's specified but
empty.
This commit is contained in:
Mike McQuaid 2017-04-22 17:28:51 +01:00
parent 114e8c5537
commit 688034d22a

View File

@ -320,15 +320,15 @@ def which_all(cmd, path = ENV["PATH"])
end
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?
# Find Textmate
editor = "mate" if which "mate"
editor = which("mate", ENV["HOMEBREW_PATH"])
# Find BBEdit / TextWrangler
editor ||= "edit" if which "edit"
editor ||= which("edit", ENV["HOMEBREW_PATH"])
# Find vim
editor ||= "vim" if which "vim"
editor ||= which("vim", ENV["HOMEBREW_PATH"])
# Default to standard vim
editor ||= "/usr/bin/vim"