From 512a3da8868735f17abb959a682ee5c736c0af3a Mon Sep 17 00:00:00 2001 From: Max Howell Date: Wed, 30 Sep 2009 17:45:14 +0100 Subject: [PATCH] brew list lists root keg files if not README, etc. --- Library/Homebrew/brew.h.rb | 10 +++++++--- Library/Homebrew/install.rb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb index 82bcafe707..5ff3ad195a 100644 --- a/Library/Homebrew/brew.h.rb +++ b/Library/Homebrew/brew.h.rb @@ -21,6 +21,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +FORMULA_META_FILES = %w[README ChangeLog COPYING LICENSE COPYRIGHT AUTHORS] + def __make url, name require 'formula' @@ -306,15 +308,17 @@ class PrettyListing (pnn.extname == '.dylib' or pnn.extname == '.pc') and not pnn.symlink? end else - print_dir pn + if pn.directory? + print_dir pn + elsif not FORMULA_META_FILES.include? pn.basename.to_s + puts pn + end end end end private def print_dir root - return unless root.directory? - dirs = [] remaining_root_files = [] other = '' diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 82785ea99d..86836831ea 100755 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -60,7 +60,7 @@ def install f f.prefix.mkpath beginning=Time.now f.install - %w[README ChangeLog COPYING LICENSE COPYRIGHT AUTHORS].each do |file| + FORMULA_META_FILES.each do |file| FileUtils.mv "#{file}.txt", file rescue nil f.prefix.install file rescue nil end