mirror of
https://github.com/Homebrew/brew.git
synced 2025-07-14 16:09:03 +08:00
Merge pull request #15690 from p-linnane/fix-various-typos
various: fix miscellaneous typos
This commit is contained in:
commit
93ba81208c
@ -98,7 +98,7 @@ class Dependency
|
|||||||
# `[dependent, dep]` pairs to allow callers to apply arbitrary filters to
|
# `[dependent, dep]` pairs to allow callers to apply arbitrary filters to
|
||||||
# the list.
|
# the list.
|
||||||
# The default filter, which is applied when a block is not given, omits
|
# The default filter, which is applied when a block is not given, omits
|
||||||
# optionals and recommendeds based on what the dependent has asked for
|
# optionals and recommends based on what the dependent has asked for
|
||||||
def expand(dependent, deps = dependent.deps, cache_key: nil, &block)
|
def expand(dependent, deps = dependent.deps, cache_key: nil, &block)
|
||||||
# Keep track dependencies to avoid infinite cyclic dependency recursion.
|
# Keep track dependencies to avoid infinite cyclic dependency recursion.
|
||||||
@expand_stack ||= []
|
@expand_stack ||= []
|
||||||
|
@ -18,7 +18,7 @@ module Homebrew
|
|||||||
].freeze
|
].freeze
|
||||||
private_constant :DYNAMIC_LINKERS
|
private_constant :DYNAMIC_LINKERS
|
||||||
|
|
||||||
# We link GCC runtime libraries that are not specificaly used for Fortran,
|
# We link GCC runtime libraries that are not specifically used for Fortran,
|
||||||
# which are linked by the GCC formula. We only use the versioned shared libraries
|
# which are linked by the GCC formula. We only use the versioned shared libraries
|
||||||
# as the other shared and static libraries are only used at build time where
|
# as the other shared and static libraries are only used at build time where
|
||||||
# GCC can find its own libraries.
|
# GCC can find its own libraries.
|
||||||
|
@ -92,7 +92,7 @@ module Homebrew
|
|||||||
pub_date = item.elements["pubDate"]&.text&.strip&.presence&.then do |date_string|
|
pub_date = item.elements["pubDate"]&.text&.strip&.presence&.then do |date_string|
|
||||||
Time.parse(date_string)
|
Time.parse(date_string)
|
||||||
rescue ArgumentError
|
rescue ArgumentError
|
||||||
# Omit unparseable strings (e.g. non-English dates)
|
# Omit unparsable strings (e.g. non-English dates)
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@ class Requirement
|
|||||||
# `[dependent, req]` pairs to allow callers to apply arbitrary filters to
|
# `[dependent, req]` pairs to allow callers to apply arbitrary filters to
|
||||||
# the list.
|
# the list.
|
||||||
# The default filter, which is applied when a block is not given, omits
|
# The default filter, which is applied when a block is not given, omits
|
||||||
# optionals and recommendeds based on what the dependent has asked for.
|
# optionals and recommends based on what the dependent has asked for.
|
||||||
def expand(dependent, cache_key: nil, &block)
|
def expand(dependent, cache_key: nil, &block)
|
||||||
if cache_key.present?
|
if cache_key.present?
|
||||||
cache[cache_key] ||= {}
|
cache[cache_key] ||= {}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
module Homebrew
|
module Homebrew
|
||||||
# Helper module for simulating different system condfigurations.
|
# Helper module for simulating different system configurations.
|
||||||
#
|
#
|
||||||
# @api private
|
# @api private
|
||||||
class SimulateSystem
|
class SimulateSystem
|
||||||
|
@ -107,7 +107,7 @@ describe Caveats do
|
|||||||
allow(Utils::Service).to receive(:systemctl?).and_return(true)
|
allow(Utils::Service).to receive(:systemctl?).and_return(true)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "prints warning when no service deamon is found" do
|
it "prints warning when no service daemon is found" do
|
||||||
f = formula do
|
f = formula do
|
||||||
url "foo-1.0"
|
url "foo-1.0"
|
||||||
service do
|
service do
|
||||||
|
@ -265,7 +265,7 @@ describe Homebrew::Livecheck do
|
|||||||
describe "::preprocess_url" do
|
describe "::preprocess_url" do
|
||||||
let(:github_git_url_with_extension) { "https://github.com/Homebrew/brew.git" }
|
let(:github_git_url_with_extension) { "https://github.com/Homebrew/brew.git" }
|
||||||
|
|
||||||
it "returns the unmodified URL for an unparseable URL" do
|
it "returns the unmodified URL for an unparsable URL" do
|
||||||
# Modeled after the `head` URL in the `ncp` formula
|
# Modeled after the `head` URL in the `ncp` formula
|
||||||
expect(livecheck.preprocess_url(":something:cvs:@cvs.brew.sh:/cvs"))
|
expect(livecheck.preprocess_url(":something:cvs:@cvs.brew.sh:/cvs"))
|
||||||
.to eq(":something:cvs:@cvs.brew.sh:/cvs")
|
.to eq(":something:cvs:@cvs.brew.sh:/cvs")
|
||||||
|
@ -5,7 +5,7 @@ require "rubocops/bottle"
|
|||||||
describe RuboCop::Cop::FormulaAudit::BottleDigestIndentation do
|
describe RuboCop::Cop::FormulaAudit::BottleDigestIndentation do
|
||||||
subject(:cop) { described_class.new }
|
subject(:cop) { described_class.new }
|
||||||
|
|
||||||
it "reports no offenses for `bottle :uneeded`" do
|
it "reports no offenses for `bottle :unneeded`" do
|
||||||
expect_no_offenses(<<~RUBY)
|
expect_no_offenses(<<~RUBY)
|
||||||
class Foo < Formula
|
class Foo < Formula
|
||||||
url "https://brew.sh/foo-1.0.tgz"
|
url "https://brew.sh/foo-1.0.tgz"
|
||||||
|
@ -5,7 +5,7 @@ require "rubocops/bottle"
|
|||||||
describe RuboCop::Cop::FormulaAudit::BottleFormat do
|
describe RuboCop::Cop::FormulaAudit::BottleFormat do
|
||||||
subject(:cop) { described_class.new }
|
subject(:cop) { described_class.new }
|
||||||
|
|
||||||
it "reports no offenses for `bottle :uneeded`" do
|
it "reports no offenses for `bottle :unneeded`" do
|
||||||
expect_no_offenses(<<~RUBY)
|
expect_no_offenses(<<~RUBY)
|
||||||
class Foo < Formula
|
class Foo < Formula
|
||||||
url "https://brew.sh/foo-1.0.tgz"
|
url "https://brew.sh/foo-1.0.tgz"
|
||||||
|
@ -5,7 +5,7 @@ require "rubocops/bottle"
|
|||||||
describe RuboCop::Cop::FormulaAudit::BottleOrder do
|
describe RuboCop::Cop::FormulaAudit::BottleOrder do
|
||||||
subject(:cop) { described_class.new }
|
subject(:cop) { described_class.new }
|
||||||
|
|
||||||
it "reports no offenses for `bottle :uneeded`" do
|
it "reports no offenses for `bottle :unneeded`" do
|
||||||
expect_no_offenses(<<~RUBY)
|
expect_no_offenses(<<~RUBY)
|
||||||
class Foo < Formula
|
class Foo < Formula
|
||||||
url "https://brew.sh/foo-1.0.tgz"
|
url "https://brew.sh/foo-1.0.tgz"
|
||||||
|
@ -5,7 +5,7 @@ require "rubocops/bottle"
|
|||||||
describe RuboCop::Cop::FormulaAudit::BottleTagIndentation do
|
describe RuboCop::Cop::FormulaAudit::BottleTagIndentation do
|
||||||
subject(:cop) { described_class.new }
|
subject(:cop) { described_class.new }
|
||||||
|
|
||||||
it "reports no offenses for `bottle :uneeded`" do
|
it "reports no offenses for `bottle :unneeded`" do
|
||||||
expect_no_offenses(<<~RUBY)
|
expect_no_offenses(<<~RUBY)
|
||||||
class Foo < Formula
|
class Foo < Formula
|
||||||
url "https://brew.sh/foo-1.0.tgz"
|
url "https://brew.sh/foo-1.0.tgz"
|
||||||
|
@ -122,7 +122,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Text do
|
|||||||
RUBY
|
RUBY
|
||||||
end
|
end
|
||||||
|
|
||||||
it %Q(reports no offenses if formula name appears afer "\#{share}/<directory name>") do
|
it %Q(reports no offenses if formula name appears after "\#{share}/<directory name>") do
|
||||||
expect_no_offenses(<<~RUBY, "/homebrew-core/Formula/foo.rb")
|
expect_no_offenses(<<~RUBY, "/homebrew-core/Formula/foo.rb")
|
||||||
class Foo < Formula
|
class Foo < Formula
|
||||||
def install
|
def install
|
||||||
|
@ -143,7 +143,7 @@ describe TestRunnerFormula do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when a formula does not require a specfic architecture" do
|
context "when a formula does not require a specific architecture" do
|
||||||
it "returns false" do
|
it "returns false" do
|
||||||
expect(described_class.new(testball).x86_64_only?).to be(false)
|
expect(described_class.new(testball).x86_64_only?).to be(false)
|
||||||
expect(described_class.new(xcode_helper).x86_64_only?).to be(false)
|
expect(described_class.new(xcode_helper).x86_64_only?).to be(false)
|
||||||
|
@ -97,7 +97,7 @@ fi
|
|||||||
###
|
###
|
||||||
|
|
||||||
# Check for specific patterns and prompt messages if detected
|
# Check for specific patterns and prompt messages if detected
|
||||||
no_forbidden_patten() {
|
no_forbidden_pattern() {
|
||||||
local file="$1"
|
local file="$1"
|
||||||
local tempfile="$2"
|
local tempfile="$2"
|
||||||
local subject="$3"
|
local subject="$3"
|
||||||
@ -131,7 +131,7 @@ no_tabs() {
|
|||||||
local file="$1"
|
local file="$1"
|
||||||
local tempfile="$2"
|
local tempfile="$2"
|
||||||
|
|
||||||
no_forbidden_patten "${file}" "${tempfile}" \
|
no_forbidden_pattern "${file}" "${tempfile}" \
|
||||||
"Indent with tab" \
|
"Indent with tab" \
|
||||||
'Replace tabs with 2 spaces instead.' \
|
'Replace tabs with 2 spaces instead.' \
|
||||||
'^[[:space:]]+' \
|
'^[[:space:]]+' \
|
||||||
@ -167,7 +167,7 @@ Use the followings instead (keep for statements only one line):
|
|||||||
EOMSG
|
EOMSG
|
||||||
)"
|
)"
|
||||||
|
|
||||||
no_forbidden_patten "${file}" "${tempfile}" \
|
no_forbidden_pattern "${file}" "${tempfile}" \
|
||||||
"Multiline for statement" \
|
"Multiline for statement" \
|
||||||
"${message}" \
|
"${message}" \
|
||||||
"${regex}"
|
"${regex}"
|
||||||
@ -197,7 +197,7 @@ Use the followings instead:
|
|||||||
EOMSG
|
EOMSG
|
||||||
)"
|
)"
|
||||||
|
|
||||||
no_forbidden_patten "${file}" "${tempfile}" \
|
no_forbidden_pattern "${file}" "${tempfile}" \
|
||||||
"Pattern \`IFS=\$'\\n'\`" \
|
"Pattern \`IFS=\$'\\n'\`" \
|
||||||
"${message}" \
|
"${message}" \
|
||||||
"${regex}"
|
"${regex}"
|
||||||
|
@ -47,7 +47,7 @@ The `livecheck` block regex restricts matches to a subset of the fetched content
|
|||||||
|
|
||||||
* **Anchor the start/end of the regex, to restrict the scope**. For example, on HTML pages we often match file names or version directories in `href` attribute URLs (e.g. `/href=.*?example[._-]v?(\d+(?:\.\d+)+)\.zip/i`). The general idea is that limiting scope will help exclude unwanted matches.
|
* **Anchor the start/end of the regex, to restrict the scope**. For example, on HTML pages we often match file names or version directories in `href` attribute URLs (e.g. `/href=.*?example[._-]v?(\d+(?:\.\d+)+)\.zip/i`). The general idea is that limiting scope will help exclude unwanted matches.
|
||||||
|
|
||||||
* **Avoid generic catch-alls like `.*` or `.+`** in favor of something non-greedy and/or contextually appropriate. For example, to match characters within the bounds of an HTML attribute, use `[^"' >]+?`.
|
* **Avoid generic catchalls like `.*` or `.+`** in favor of something non-greedy and/or contextually appropriate. For example, to match characters within the bounds of an HTML attribute, use `[^"' >]+?`.
|
||||||
|
|
||||||
* **Use `[._-]` in place of a period/underscore/hyphen between the software name and version in a file name**. For a file named `example-1.2.3.tar.gz`, `example[._-]v?(\d+(?:\.\d+)+)\.t` will continue matching if the upstream file name format changes to `example_1.2.3.tar.gz` or `example.1.2.3.tar.gz`.
|
* **Use `[._-]` in place of a period/underscore/hyphen between the software name and version in a file name**. For a file named `example-1.2.3.tar.gz`, `example[._-]v?(\d+(?:\.\d+)+)\.t` will continue matching if the upstream file name format changes to `example_1.2.3.tar.gz` or `example.1.2.3.tar.gz`.
|
||||||
|
|
||||||
|
@ -1125,7 +1125,7 @@ Artifacts also may be distributed via Git repositories. URLs that end in `.git`
|
|||||||
| `tag:` | string identifying the Git tag to download
|
| `tag:` | string identifying the Git tag to download
|
||||||
| `revision:` | string identifying the Git revision to download
|
| `revision:` | string identifying the Git revision to download
|
||||||
| `branch:` | string identifying the Git branch to download
|
| `branch:` | string identifying the Git branch to download
|
||||||
| `only_path:` | path within the repository to limit the checkout to. If only a single directory of a large repository is required, using this option can signficantly speed up downloads. If provided, artifact paths are relative to this path.
|
| `only_path:` | path within the repository to limit the checkout to. If only a single directory of a large repository is required, using this option can significantly speed up downloads. If provided, artifact paths are relative to this path.
|
||||||
|
|
||||||
#### SourceForge/OSDN URLs
|
#### SourceForge/OSDN URLs
|
||||||
|
|
||||||
|
@ -991,7 +991,7 @@ Keep alive until the service exits with a non-zero return code:
|
|||||||
```ruby
|
```ruby
|
||||||
service do
|
service do
|
||||||
run [opt_bin/"beanstalkd", "test"]
|
run [opt_bin/"beanstalkd", "test"]
|
||||||
keep_alive succesful_exit: true
|
keep_alive successful_exit: true
|
||||||
end
|
end
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
- 19:05 Project Leader Report (10 min, Mike McQuaid)
|
- 19:05 Project Leader Report (10 min, Mike McQuaid)
|
||||||
- 19:15 Project Leadership Committee Report (10 min, Misty De Méo)
|
- 19:15 Project Leadership Committee Report (10 min, Misty De Méo)
|
||||||
- 19:25 Treasurer's Financial Report (5 min, Jon Chang)
|
- 19:25 Treasurer's Financial Report (5 min, Jon Chang)
|
||||||
- 19:30 Technical Steering Commitee Report (10 min, Rylan Polster)
|
- 19:30 Technical Steering Committee Report (10 min, Rylan Polster)
|
||||||
|
|
||||||
## Election Results
|
## Election Results
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Homebrew Annual General Meeting 2022
|
# Homebrew Annual General Meeting 2023
|
||||||
|
|
||||||
## Minutes
|
## Minutes
|
||||||
|
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
- 09:15 Project Leader Report (15 min, Mike McQuaid)
|
- 09:15 Project Leader Report (15 min, Mike McQuaid)
|
||||||
- 09:40 Project Leadership Committee Report (15 min, Sean Molenaar)
|
- 09:40 Project Leadership Committee Report (15 min, Sean Molenaar)
|
||||||
- 10:00 Technical Steering Commitee Report (15 min, Michka Popoff)
|
- 10:00 Technical Steering Committee Report (15 min, Michka Popoff)
|
||||||
|
|
||||||
## Election Results
|
## Election Results
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user