admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

avoid duplicating logic

Browse Source
This commit is contained in:
Yukai Chou 2023-04-06 04:59:55 +08:00
parent b1b94187af
commit 1098cb6a7d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/tap.rb
View File

@ -561,7 +561,7 @@ class Tap
file.extname == ".rb" file.extname == ".rb"
end end
# return true if given path would present a {Formula} file in this {Tap}. # returns true if given path would present a {Formula} file in this {Tap}.
# accepts both absolute path and relative path (relative to this {Tap}'s path) # accepts both absolute path and relative path (relative to this {Tap}'s path)
# @private # @private
sig { params(file: T.any(String, Pathname)).returns(T::Boolean) } sig { params(file: T.any(String, Pathname)).returns(T::Boolean) }
@ -569,11 +569,12 @@ class Tap
file = Pathname.new(file) unless file.is_a? Pathname file = Pathname.new(file) unless file.is_a? Pathname
file = file.expand_path(path) file = file.expand_path(path)
return false unless ruby_file?(file) return false unless ruby_file?(file)
return false if cask_pathname?(file)
file.to_s.start_with?("#{formula_dir}/") && !file.to_s.start_with?("#{cask_dir}/") file.to_s.start_with?("#{formula_dir}/")
end end
# return true if given path would present a {Cask} file in this {Tap}. # returns true if given path would present a {Cask} file in this {Tap}.
# accepts both absolute path and relative path (relative to this {Tap}'s path) # accepts both absolute path and relative path (relative to this {Tap}'s path)
# @private # @private
sig { params(file: T.any(String, Pathname)).returns(T::Boolean) } sig { params(file: T.any(String, Pathname)).returns(T::Boolean) }