diff options
| author | Mike McQuaid | 2017-05-14 15:08:47 +0100 |
|---|---|---|
| committer | GitHub | 2017-05-14 15:08:47 +0100 |
| commit | 13efa8656e2abf91561ef5a249c25298157eecb9 (patch) | |
| tree | 0ee4d323daafb2ff97cb50c67781e12e98812617 /Library/Homebrew/utils.rb | |
| parent | d0e3f3574f9260dba95cdb79ece8759a1c92eac0 (diff) | |
| parent | 8205e61e6493f7c0a91c0311a321a80830f70bc3 (diff) | |
| download | brew-13efa8656e2abf91561ef5a249c25298157eecb9.tar.bz2 | |
Merge pull request #2620 from MikeMcQuaid/more-env-filtering-tweaks
More environment filtering tweaks
Diffstat (limited to 'Library/Homebrew/utils.rb')
| -rw-r--r-- | Library/Homebrew/utils.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index c37633e41..28d7fc283 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -320,7 +320,7 @@ def which_all(cmd, path = ENV["PATH"]) end def which_editor - editor = ENV.values_at("HOMEBREW_EDITOR", "VISUAL").compact.reject(&:empty?).first + editor = ENV.values_at("HOMEBREW_EDITOR", "HOMEBREW_VISUAL").compact.reject(&:empty?).first if editor editor_name, _, editor_args = editor.partition " " editor_path = which(editor_name, ENV["HOMEBREW_PATH"]) @@ -356,7 +356,7 @@ def exec_editor(*args) end def exec_browser(*args) - browser = ENV["HOMEBREW_BROWSER"] || ENV["BROWSER"] + browser = ENV["HOMEBREW_BROWSER"] browser ||= OS::PATH_OPEN if defined?(OS::PATH_OPEN) return unless browser safe_exec(browser, *args) |