aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2015-01-05 15:23:35 -0500
committerJack Nagel2015-01-05 15:23:35 -0500
commit314cf2d2bbce6919cfdbec6b938431b99607f163 (patch)
tree349e80116a7364b7c0b705ef2ac594c41e479c2d
parentaab66e6fae262885ea84ac5f3b98b3f80231c1fd (diff)
downloadhomebrew-314cf2d2bbce6919cfdbec6b938431b99607f163.tar.bz2
Emit warning when no editor is set
Closes #34647.
-rw-r--r--Library/Homebrew/utils.rb17
1 files changed, 12 insertions, 5 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index d4d8288c6..c6e911bdf 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -208,17 +208,24 @@ end
def which_editor
editor = ENV.values_at('HOMEBREW_EDITOR', 'VISUAL', 'EDITOR').compact.first
- # If an editor wasn't set, try to pick a sane default
return editor unless editor.nil?
# Find Textmate
- return 'mate' if which "mate"
+ editor = "mate" if which "mate"
# Find BBEdit / TextWrangler
- return 'edit' if which "edit"
+ editor ||= "edit" if which "edit"
# Find vim
- return 'vim' if which "vim"
+ editor ||= "vim" if which "vim"
# Default to standard vim
- return '/usr/bin/vim'
+ editor ||= "/usr/bin/vim"
+
+ opoo <<-EOS.undent
+ Using #{editor} because no editor was set in the environment.
+ This may change in the future, so we recommend setting EDITOR, VISUAL,
+ or HOMEBREW_EDITOR to your preferred text editor.
+ EOS
+
+ editor
end
def exec_editor *args