From c6b6fc678e66668b08d31e7a55950768e0e4d687 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 6 Sep 2018 12:31:29 +0100 Subject: [PATCH] dev-cmd/edit: simplify project view handling. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The way Homebrew is structured now there’s no need to manually specify a few different directories here. --- Library/Homebrew/dev-cmd/edit.rb | 35 +++++++------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/Library/Homebrew/dev-cmd/edit.rb b/Library/Homebrew/dev-cmd/edit.rb index 8715d9d2e9..ab694752db 100644 --- a/Library/Homebrew/dev-cmd/edit.rb +++ b/Library/Homebrew/dev-cmd/edit.rb @@ -26,36 +26,15 @@ module Homebrew end # If no brews are listed, open the project root in an editor. - if ARGV.named.empty? - editor = File.basename which_editor - if ["atom", "subl", "mate"].include?(editor) - # If the user is using Atom, Sublime Text or TextMate - # give a nice project view instead. - exec_editor HOMEBREW_REPOSITORY/"bin/brew", - HOMEBREW_REPOSITORY/"README.md", - HOMEBREW_REPOSITORY/".gitignore", - *library_folders - else - exec_editor HOMEBREW_REPOSITORY - end - else - # Don't use ARGV.formulae as that will throw if the file doesn't parse - paths = ARGV.named.map do |name| - path = Formulary.path(name) + paths = [HOMEBREW_REPOSITORY] if ARGV.named.empty? - raise FormulaUnavailableError, name unless path.file? || args.force? - - path - end - exec_editor(*paths) + # Don't use ARGV.formulae as that will throw if the file doesn't parse + paths ||= ARGV.named.map do |name| + path = Formulary.path(name) + raise FormulaUnavailableError, name if !path.file? && !args.force? + path end - end - def library_folders - Dir["#{HOMEBREW_LIBRARY}/*"].reject do |d| - case File.basename(d) - when "LinkedKegs", "Aliases" then true - end - end + exec_editor(*paths) end end