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

Merge pull request #19540 from Homebrew/brew_bundle_cleanup

Browse Source 
Cleanup some missing references to Homebrew Bundle.
This commit is contained in:
Mike McQuaid 2025-03-19 10:07:37 +00:00 committed by GitHub
commit f8baea29cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/brew.sh
View File

@ -246,7 +246,7 @@ check-run-command-as-root() {
[[ -f /run/.containerenv ]] && return
[[ -f /proc/1/cgroup ]] && grep -E "azpl_job|actions_job|docker|garden|kubepods" -q /proc/1/cgroup && return
# Homebrew Services may need `sudo` for system-wide daemons.
# `brew services` may need `sudo` for system-wide daemons.
[[ "${HOMEBREW_COMMAND}" == "services" ]] && return
# It's fine to run this as root as it's not changing anything.

2
Library/Homebrew/bundle/commands/cleanup.rb
View File

@ -151,7 +151,7 @@ module Homebrew
dependencies.uniq
end
IGNORED_TAPS = %w[homebrew/core homebrew/bundle].freeze
IGNORED_TAPS = %w[homebrew/core].freeze
def taps_to_untap(global: false, file: nil)
@dsl ||= Brewfile.read(global:, file:)

4
Library/Homebrew/bundle/installer.rb
View File

@ -61,13 +61,13 @@ module Homebrew
unless failure.zero?
dependency = Homebrew::Bundle::Dsl.pluralize_dependency(failure)
$stderr.puts Formatter.error "Homebrew Bundle failed! #{failure} Brewfile #{dependency} failed to install"
$stderr.puts Formatter.error "`brew bundle` failed! #{failure} Brewfile #{dependency} failed to install"
return false
end
unless quiet
dependency = Homebrew::Bundle::Dsl.pluralize_dependency(success)
puts Formatter.success "Homebrew Bundle complete! #{success} Brewfile #{dependency} now installed."
puts Formatter.success "`brew bundle` complete! #{success} Brewfile #{dependency} now installed."
end
true

2
Library/Homebrew/dev-cmd/tap-new.rb
View File

@ -58,7 +58,7 @@ module Homebrew
Or `brew tap #{tap}` and then `brew install <formula>`.
Or, in a [`brew bundle`](https://github.com/Homebrew/homebrew-bundle) `Brewfile`:
Or, in a `brew bundle` `Brewfile`:
```ruby
tap "#{tap}"

4
Library/Homebrew/test/bundle/commands/cleanup_spec.rb
View File

@ -80,7 +80,7 @@ RSpec.describe Homebrew::Bundle::Commands::Cleanup do
it "computes which tap to untap" do
allow(Homebrew::Bundle::TapDumper).to \
receive(:tap_names).and_return(%w[z homebrew/bundle homebrew/core homebrew/tap])
receive(:tap_names).and_return(%w[z homebrew/core homebrew/tap])
expect(described_class.taps_to_untap).to eql(%w[z])
end
@ -88,7 +88,7 @@ RSpec.describe Homebrew::Bundle::Commands::Cleanup do
allow(Formulary).to \
receive(:factory).and_raise(TapFormulaUnavailableError.new(Tap.fetch("homebrew/tap"), "foo"))
allow(Homebrew::Bundle::TapDumper).to \
receive(:tap_names).and_return(%w[z homebrew/bundle homebrew/core homebrew/tap])
receive(:tap_names).and_return(%w[z homebrew/core homebrew/tap])
expect(described_class.taps_to_untap).to eql(%w[z homebrew/tap])
end

1
Library/Homebrew/test/spec_helper.rb
View File

@ -292,7 +292,6 @@ RSpec.configure do |config|
HOMEBREW_PREFIX/"Frameworks",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-cask",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bar",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-foo",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-test-bot",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-shallow",

10
docs/Common-Issues.md
View File

@ -139,7 +139,7 @@ brew upgrade
## Unintentional dual Homebrew installations
When using tools such as Apple's _Migration Assistant_ (MA), it's possible to have two Homebrew installations unintentionally.
When using tools such as Apple's *Migration Assistant* (MA), it's possible to have two Homebrew installations unintentionally.
This most commonly results in MA copying `/usr/local` and `/Applications` from an Intel-based Mac to these same paths on an Apple Silicon-based Mac.
This is problematic because `/Applications` may contain x86_64-only apps.
Using an x86_64 terminal emulator will cause the shell to use the `/usr/local` installation of Homebrew
@ -157,7 +157,7 @@ Follow these steps to do this.
1. Install Homebrew under the correct prefix (`/opt/homebrew`),
which will happen by default when the terminal is running in arm64 mode.
**Follow the _Next Steps_ instructions** listed at the end of the installation process;
**Follow the *Next Steps* instructions** listed at the end of the installation process;
failing to adjust your shell configuration accordingly could break your Homebrew installation.
1. Run `/opt/homebrew/bin/brew bundle install --global` to replicate your original formulae installation using your new Homebrew installation in `/opt/homebrew`.
@ -258,11 +258,11 @@ Help us by [submitting a fix](https://github.com/Homebrew/homebrew-cask/blob/HEA
## Other local issues
If your Homebrew installation gets messed up (and fixing the issues found by `brew doctor` doesn't solve the problem), reinstalling Homebrew may help to reset to a normal state. To easily reinstall Homebrew, use [Homebrew Bundle](https://github.com/Homebrew/homebrew-bundle) to automatically restore your installed formulae and casks. To do so, run `brew bundle dump`, [uninstall](https://docs.brew.sh/FAQ#how-do-i-uninstall-homebrew), [reinstall](https://docs.brew.sh/Installation) and run `brew bundle install`.
If your Homebrew installation gets messed up (and fixing the issues found by `brew doctor` doesn't solve the problem), reinstalling Homebrew may help to reset to a normal state. To easily reinstall Homebrew, use `brew bundle` to automatically restore your installed formulae and casks. To do so, run `brew bundle dump`, [uninstall](https://docs.brew.sh/FAQ#how-do-i-uninstall-homebrew), [reinstall](https://docs.brew.sh/Installation) and run `brew bundle install`.
## Possible `curl` issues
Sometimes, the user's computer, configuration or network connection may cause issues downloading with `curl` which are outside Homebrew's control. Homebrew requires good internet connectivity and correct configuration to function correctly. Here some links that could help you identify cURL issues based on `curl`'s and `libcurl`'s exit codes:
* https://everything.curl.dev/cmdline/exitcode.html
* https://curl.se/libcurl/c/libcurl-errors.html
* <https://everything.curl.dev/cmdline/exitcode.html>
* <https://curl.se/libcurl/c/libcurl-errors.html>

2
docs/Tips-N'-Tricks.md
View File

@ -91,7 +91,7 @@ $ brew install --cask --adopt textmate
### Visual Studio Code
- [Brewfile](https://marketplace.visualstudio.com/items?itemName=sharat.vscode-brewfile) adds Ruby syntax highlighting for [Homebrew Bundle](https://github.com/Homebrew/homebrew-bundle) `Brewfile`s.
- [Brewfile](https://marketplace.visualstudio.com/items?itemName=sharat.vscode-brewfile) adds Ruby syntax highlighting for `brew bundle`'s `Brewfile`s.
- [Brew Services](https://marketplace.visualstudio.com/items?itemName=beauallison.brew-services) is an extension for starting and stopping Homebrew services.