diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 445140838e..303a6d4506 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -91,7 +91,6 @@ jobs: brew tap homebrew/autoupdate brew tap homebrew/bundle brew tap homebrew/cask - brew tap homebrew/cask-drivers brew tap homebrew/cask-fonts brew tap homebrew/cask-versions brew tap homebrew/command-not-found @@ -118,7 +117,6 @@ jobs: - name: Run brew style on cask taps run: | brew style homebrew/cask \ - homebrew/cask-drivers \ homebrew/cask-fonts \ homebrew/cask-versions @@ -181,17 +179,15 @@ jobs: - name: Set up Homebrew all cask taps run: | brew tap homebrew/cask && brew update-reset "$(brew --repo homebrew/cask)" - brew tap homebrew/cask-drivers brew tap homebrew/cask-fonts brew tap homebrew/cask-versions - name: Run brew readall on all casks - run: brew readall --os=all --arch=all homebrew/cask homebrew/cask-drivers homebrew/cask-fonts homebrew/cask-versions + run: brew readall --os=all --arch=all homebrew/cask homebrew/cask-fonts homebrew/cask-versions - name: Run brew audit --skip-style on casks run: | brew audit --skip-style --except=version --tap=homebrew/cask - brew audit --skip-style --except=version --tap=homebrew/cask-drivers brew audit --skip-style --except=version --tap=homebrew/cask-fonts brew audit --skip-style --except=version --tap=homebrew/cask-versions diff --git a/Library/Homebrew/official_taps.rb b/Library/Homebrew/official_taps.rb index 75c0f232db..b6a36c2663 100644 --- a/Library/Homebrew/official_taps.rb +++ b/Library/Homebrew/official_taps.rb @@ -3,7 +3,6 @@ OFFICIAL_CASK_TAPS = %w[ cask - cask-drivers cask-fonts cask-versions ].freeze @@ -20,6 +19,7 @@ OFFICIAL_CMD_TAPS = { DEPRECATED_OFFICIAL_TAPS = %w[ apache binary + cask-drivers cask-eid completions devel-only diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index f0cafd42b4..43a0bafb37 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -531,7 +531,7 @@ __fish_brew_complete_arg 'contributions' -l debug -d 'Display any debugging info __fish_brew_complete_arg 'contributions' -l from -d 'Date (ISO-8601 format) to start searching contributions' __fish_brew_complete_arg 'contributions' -l help -d 'Show this message' __fish_brew_complete_arg 'contributions' -l quiet -d 'Make some output more quiet' -__fish_brew_complete_arg 'contributions' -l repositories -d 'Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask' +__fish_brew_complete_arg 'contributions' -l repositories -d 'Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask' __fish_brew_complete_arg 'contributions' -l to -d 'Date (ISO-8601 format) to stop searching contributions' __fish_brew_complete_arg 'contributions' -l user -d 'A GitHub username or email address of a specific person to find contribution data for' __fish_brew_complete_arg 'contributions' -l verbose -d 'Make some output more verbose' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index 94e026b954..78623c9f4d 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -675,7 +675,7 @@ _brew_contributions() { '--from[Date (ISO-8601 format) to start searching contributions]' \ '--help[Show this message]' \ '--quiet[Make some output more quiet]' \ - '--repositories[Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask]' \ + '--repositories[Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask]' \ '--to[Date (ISO-8601 format) to stop searching contributions]' \ '--user[A GitHub username or email address of a specific person to find contribution data for]' \ '--verbose[Make some output more verbose]' diff --git a/docs/Acceptable-Casks.md b/docs/Acceptable-Casks.md index e8ff102b60..cd2ba880a0 100644 --- a/docs/Acceptable-Casks.md +++ b/docs/Acceptable-Casks.md @@ -21,7 +21,6 @@ We maintain separate taps for different types of binaries. Our nomenclature is: * **Vendorless**: A binary distributed via means other than an official website, like a forum posting. * **Walled**: When the download URL is both behind a login/registration form and from a host that differs from the homepage. * **Font**: Data file containing a set of glyphs, characters, or symbols, that changes typed text. -* **Driver**: Software to make a hardware peripheral recognisable and usable by the system. If the software is useless without the peripheral, it’s considered a driver. ### Stable versions @@ -60,10 +59,6 @@ We do not accept these casks since they involve a higher-than-normal security ri Font casks live in the [Homebrew/homebrew-cask-fonts](https://github.com/Homebrew/homebrew-cask-fonts) repository. See the fonts repo [CONTRIBUTING.md](https://github.com/Homebrew/homebrew-cask-fonts/blob/HEAD/CONTRIBUTING.md) for details. -### Drivers - -Driver casks live in the [Homebrew/homebrew-cask-drivers](https://github.com/Homebrew/homebrew-cask-drivers) repository. See the drivers repo [CONTRIBUTING.md](https://github.com/Homebrew/homebrew-cask-drivers/blob/master/CONTRIBUTING.md) for details. - ## Apps that bundle malware Unfortunately, in the world of software there are bad actors that bundle malware with their apps. Even so, Homebrew Cask has long decided it will not be an active gatekeeper ([macOS already has one](https://support.apple.com/en-us/HT202491)) and [users are expected to know about the software they are installing](#homebrew-cask-is-not-a-discoverability-service). This means we will not always remove casks that link to these apps, in part because there is no clear line between useful app, potentially unwanted program, and the different shades of malware—what is useful to one user may be seen as malicious by another. diff --git a/docs/Cask-Cookbook.md b/docs/Cask-Cookbook.md index 51ea27192d..66125023aa 100644 --- a/docs/Cask-Cookbook.md +++ b/docs/Cask-Cookbook.md @@ -1419,7 +1419,6 @@ Cask taps have naming conventions specific to each tap. * [Homebrew/cask-versions](https://github.com/Homebrew/homebrew-cask-versions/blob/HEAD/CONTRIBUTING.md#naming-versions-casks) * [Homebrew/cask-fonts](https://github.com/Homebrew/homebrew-cask-fonts/blob/HEAD/CONTRIBUTING.md#naming-font-casks) -* [Homebrew/cask-drivers](https://github.com/Homebrew/homebrew-cask-drivers/blob/HEAD/CONTRIBUTING.md#naming-driver-casks) ### Special Affixes diff --git a/docs/Homebrew-homebrew-cask-Maintainer-Guide.md b/docs/Homebrew-homebrew-cask-Maintainer-Guide.md index 9b3ae9a935..c031d0ac1d 100644 --- a/docs/Homebrew-homebrew-cask-Maintainer-Guide.md +++ b/docs/Homebrew-homebrew-cask-Maintainer-Guide.md @@ -2,10 +2,9 @@ This guide is intended to help maintainers effectively maintain the cask repositories. It is meant to be used in conjunction with the more generic [Maintainer Guidelines](Maintainer-Guidelines.md). -This guide applies to all four of the cask repositories: +This guide applies to all three of the cask repositories: - [Homebrew/homebrew-cask](https://github.com/Homebrew/homebrew-cask): The main cask repository -- [Homebrew/homebrew-cask-drivers](https://github.com/Homebrew/homebrew-cask-drivers): Casks of drivers - [Homebrew/homebrew-cask-fonts](https://github.com/Homebrew/homebrew-cask-fonts): Casks of fonts - [Homebrew/homebrew-cask-versions](https://github.com/Homebrew/homebrew-cask-versions): Alternate versions of casks diff --git a/docs/Maintainer-Guidelines.md b/docs/Maintainer-Guidelines.md index 5d48a2c532..e75ee29c7d 100644 --- a/docs/Maintainer-Guidelines.md +++ b/docs/Maintainer-Guidelines.md @@ -11,7 +11,7 @@ All Homebrew maintainers are encouraged to contribute to all parts of the projec - `brew` maintainers: this team maintains the [`Homebrew/brew`](https://github.com/Homebrew/brew) repository. See the [Homebrew/brew Maintainer Guide](Homebrew-brew-Maintainer-Guide.md) for more details about being a `brew` maintainer. - Core maintainers: this team maintains the [`Homebrew/homebrew-core`](https://github.com/Homebrew/homebrew-core) repository. See the [Homebrew/homebrew-core Maintainer Guide](Homebrew-homebrew-core-Maintainer-Guide.md) for more details about being a core maintainer. - Linux maintainers: this team maintains the [`Homebrew/homebrew-core`](https://github.com/Homebrew/homebrew-core) repository on Linux. -- Cask maintainers: this team maintains the [`Homebrew/homebrew-cask`](https://github.com/Homebrew/homebrew-cask), [`Homebrew/homebrew-cask-drivers`](https://github.com/Homebrew/homebrew-cask-drivers), [`Homebrew/homebrew-cask-fonts`](https://github.com/Homebrew/homebrew-cask-fonts) and [`Homebrew/homebrew-cask-versions`](https://github.com/Homebrew/homebrew-cask-versions) repositories. See the [Homebrew/homebrew-cask Maintainer Guide](Homebrew-homebrew-cask-Maintainer-Guide.md) for more details about being a cask maintainer. +- Cask maintainers: this team maintains the [`Homebrew/homebrew-cask`](https://github.com/Homebrew/homebrew-cask), [`Homebrew/homebrew-cask-fonts`](https://github.com/Homebrew/homebrew-cask-fonts) and [`Homebrew/homebrew-cask-versions`](https://github.com/Homebrew/homebrew-cask-versions) repositories. See the [Homebrew/homebrew-cask Maintainer Guide](Homebrew-homebrew-cask-Maintainer-Guide.md) for more details about being a cask maintainer. These documents are meant to serve as guiding principles. As a maintainer, you can make a call to either request changes from a contributor or help them out based on their comfort and previous contributions. Remember, as a team we [Prioritise Maintainers Over Users](Maintainers-Avoiding-Burnout.md) to avoid burnout. If you wish to change or discuss any of the guidelines: open a PR to suggest a change. diff --git a/docs/Manpage.md b/docs/Manpage.md index 350a82fc60..65bc58445f 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1155,7 +1155,7 @@ Display the path to the file being used when invoking `brew` *`cmd`*. Contributions to Homebrew repos. * `--repositories`: - Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask. + Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask. * `--from`: Date (ISO-8601 format) to start searching contributions. * `--to`: diff --git a/manpages/brew.1 b/manpages/brew.1 index adc64488e6..8b7fbd1604 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1661,7 +1661,7 @@ Contributions to Homebrew repos\. . .TP \fB\-\-repositories\fR -Specify a comma\-separated (no spaces) list of repositories to search\. Supported repositories: \fBbrew\fR, \fBcore\fR, \fBcask\fR, \fBaliases\fR, \fBautoupdate\fR, \fBbundle\fR, \fBcommand\-not\-found\fR, \fBtest\-bot\fR, \fBservices\fR, \fBcask\-drivers\fR, \fBcask\-fonts\fR and \fBcask\-versions\fR\. Omitting this flag, or specifying \fB\-\-repositories=all\fR, searches all repositories\. Use \fB\-\-repositories=primary\fR to search only the main repositories: brew,core,cask\. +Specify a comma\-separated (no spaces) list of repositories to search\. Supported repositories: \fBbrew\fR, \fBcore\fR, \fBcask\fR, \fBaliases\fR, \fBautoupdate\fR, \fBbundle\fR, \fBcommand\-not\-found\fR, \fBtest\-bot\fR, \fBservices\fR, \fBcask\-fonts\fR and \fBcask\-versions\fR\. Omitting this flag, or specifying \fB\-\-repositories=all\fR, searches all repositories\. Use \fB\-\-repositories=primary\fR to search only the main repositories: brew,core,cask\. . .TP \fB\-\-from\fR