mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't convert boolean and blank values to strings in cask artifacts API

Browse Source
This commit is contained in:
Rylan Polster 2023-02-05 02:49:41 +01:00
parent 39e158fb93
commit a166be9541
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/cask/cask.rb
View File

@ -292,14 +292,20 @@ module Cask
artifacts.map do |artifact| artifacts.map do |artifact|
next artifact.to_h if artifact.is_a? Artifact::AbstractFlightBlock next artifact.to_h if artifact.is_a? Artifact::AbstractFlightBlock
if artifact.is_a? Artifact::Relocated
source, *args = artifact.to_args
next { artifact.class.dsl_key => [to_h_string_gsubs(source, replace_prefix: false), *to_h_gsubs(args)] }
end
{ artifact.class.dsl_key => to_h_gsubs(artifact.to_args) } { artifact.class.dsl_key => to_h_gsubs(artifact.to_args) }
end end
end end
def to_h_string_gsubs(string) def to_h_string_gsubs(string, replace_prefix: true)
string.to_s string = string.to_s.gsub(Dir.home, "$HOME")
.gsub(Dir.home, "$HOME") return string unless replace_prefix
.gsub(HOMEBREW_PREFIX, "$(brew --prefix)")
string.gsub(HOMEBREW_PREFIX, "$(brew --prefix)")
end end
def to_h_array_gsubs(array) def to_h_array_gsubs(array)
@ -317,10 +323,14 @@ module Cask
end end
def to_h_gsubs(value) def to_h_gsubs(value)
return value if value.blank?
if value.respond_to? :to_h if value.respond_to? :to_h
to_h_hash_gsubs(value) to_h_hash_gsubs(value)
elsif value.respond_to? :to_a elsif value.respond_to? :to_a
to_h_array_gsubs(value) to_h_array_gsubs(value)
elsif [true, false].include? value
value
else else
to_h_string_gsubs(value) to_h_string_gsubs(value)
end end

4
Library/Homebrew/cask/cask_loader.rb
View File

@ -322,12 +322,14 @@ module Cask
end end
def from_h_gsubs(value) def from_h_gsubs(value)
return value if value.blank?
if value.respond_to? :to_h if value.respond_to? :to_h
from_h_hash_gsubs(value) from_h_hash_gsubs(value)
elsif value.respond_to? :to_a elsif value.respond_to? :to_a
from_h_array_gsubs(value) from_h_array_gsubs(value)
else else
from_h_string_gsubs(value) { "true" => true, "false" => false }.fetch(value, from_h_string_gsubs(value))
end end
end end
end end