From dbb731bce297d67ff6159e2b217e8c18e799fdf4 Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Fri, 10 Jan 2025 11:00:16 -0800 Subject: [PATCH] brew style --fix --- Library/Homebrew/cmd/list.rb | 2 +- Library/Homebrew/extend/os/linux/extend/ENV/super.rb | 2 +- Library/Homebrew/tab.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb index 052017bc43..9f863d180f 100644 --- a/Library/Homebrew/cmd/list.rb +++ b/Library/Homebrew/cmd/list.rb @@ -252,7 +252,7 @@ module Homebrew when "lib" print_dir pn do |pnn| # dylibs have multiple symlinks and we don't care about them - (pnn.extname == ".dylib" || pnn.extname == ".pc") && !pnn.symlink? + [".dylib", ".pc"].include?(pnn.extname) && !pnn.symlink? end when ".brew" next # Ignore .brew diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb index f0aa87920e..0d2676055d 100644 --- a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb @@ -29,7 +29,7 @@ module Superenv self["HOMEBREW_OPTIMIZATION_LEVEL"] = "O2" self["HOMEBREW_DYNAMIC_LINKER"] = determine_dynamic_linker_path self["HOMEBREW_RPATH_PATHS"] = determine_rpath_paths(@formula) - self["M4"] = "#{HOMEBREW_PREFIX}/opt/m4/bin/m4" if deps.any? { |d| d.name == "libtool" || d.name == "bison" } + self["M4"] = "#{HOMEBREW_PREFIX}/opt/m4/bin/m4" if deps.any? { |d| ["libtool", "bison"].include?(d.name) } end def homebrew_extra_paths diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index ac04c6880a..9ed84fd139 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -176,7 +176,7 @@ class Tab < AbstractTab tab.source ||= {} tab.tap = tab.tapped_from if !tab.tapped_from.nil? && tab.tapped_from != "path or URL" - tab.tap = "homebrew/core" if tab.tap == "mxcl/master" || tab.tap == "Homebrew/homebrew" + tab.tap = "homebrew/core" if ["mxcl/master", "Homebrew/homebrew"].include?(tab.tap) if tab.source["spec"].nil? version = PkgVersion.parse(File.basename(File.dirname(path)))