diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index d74fc2578b..98bd32a7d7 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -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. diff --git a/Library/Homebrew/bundle/commands/cleanup.rb b/Library/Homebrew/bundle/commands/cleanup.rb index 63f238e495..66fc099207 100644 --- a/Library/Homebrew/bundle/commands/cleanup.rb +++ b/Library/Homebrew/bundle/commands/cleanup.rb @@ -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:) diff --git a/Library/Homebrew/bundle/installer.rb b/Library/Homebrew/bundle/installer.rb index 5a27992eee..3cdf87b40b 100644 --- a/Library/Homebrew/bundle/installer.rb +++ b/Library/Homebrew/bundle/installer.rb @@ -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 diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb index 5f1423fb64..6d80400705 100644 --- a/Library/Homebrew/dev-cmd/tap-new.rb +++ b/Library/Homebrew/dev-cmd/tap-new.rb @@ -58,7 +58,7 @@ module Homebrew Or `brew tap #{tap}` and then `brew install `. - Or, in a [`brew bundle`](https://github.com/Homebrew/homebrew-bundle) `Brewfile`: + Or, in a `brew bundle` `Brewfile`: ```ruby tap "#{tap}" diff --git a/Library/Homebrew/test/bundle/commands/cleanup_spec.rb b/Library/Homebrew/test/bundle/commands/cleanup_spec.rb index 95f875cfcb..7696226676 100644 --- a/Library/Homebrew/test/bundle/commands/cleanup_spec.rb +++ b/Library/Homebrew/test/bundle/commands/cleanup_spec.rb @@ -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 diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index b027baf0b8..20a1d0c5c1 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -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", diff --git a/docs/Common-Issues.md b/docs/Common-Issues.md index 261a9c2b6c..30d29ae5de 100644 --- a/docs/Common-Issues.md +++ b/docs/Common-Issues.md @@ -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 +* +* diff --git a/docs/Tips-N'-Tricks.md b/docs/Tips-N'-Tricks.md index ea2ce64612..f3b4914215 100644 --- a/docs/Tips-N'-Tricks.md +++ b/docs/Tips-N'-Tricks.md @@ -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.