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

apply naming suggestions

Browse Source
This commit is contained in:
Max Eisner 2022-07-24 22:54:28 +02:00
parent 9528c6a8ac
commit 92bccd2074
No known key found for this signature in database
GPG Key ID: 4BF122C22879F0C8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/formula.rb
View File

@ -1638,11 +1638,11 @@ class Formula
params(base_name: String, shells: T::Array[Symbol], binary: Pathname, cmd: String, params(base_name: String, shells: T::Array[Symbol], binary: Pathname, cmd: String,
shell_prefix: T.nilable(T.any(Symbol, String))).void shell_prefix: T.nilable(T.any(Symbol, String))).void
} }
def generate_completions(base_name: name, def generate_completions_from_executable(base_name: name,
shells: [:bash, :zsh, :fish], shells: [:bash, :zsh, :fish],
binary: bin/base_name, executable: bin/base_name,
cmd: "completion", cmd: "completion",
shell_prefix: nil) shell_parameter: nil)
completion_script_path_map = { completion_script_path_map = {
bash: bash_completion/base_name, bash: bash_completion/base_name,
zsh: zsh_completion/"_#{base_name}", zsh: zsh_completion/"_#{base_name}",
@ -1651,16 +1651,16 @@ class Formula
shells.each do |shell| shells.each do |shell|
script_path = completion_script_path_map[shell] script_path = completion_script_path_map[shell]
shell_parameter = if shell_prefix.nil? shell_parameter = if shell_parameter.nil?
shell.to_s shell.to_s
elsif shell_prefix == :flag elsif shell_parameter == :flag
"--#{shell}" "--#{shell}"
else else
"#{shell_prefix}#{shell}" "#{shell_parameter}#{shell}"
end end
script_path.dirname.mkpath script_path.dirname.mkpath
script_path.write Utils.safe_popen_read({ "SHELL" => shell }, binary, cmd, shell_parameter) script_path.write Utils.safe_popen_read({ "SHELL" => shell }, executable, cmd, shell_parameter)
end end
end end