Remove mentions to official taps

There are none remaining. We don’t want PHP to get the deprecated
messages until all formulae have been deleted so that will be in a
later PR.
This commit is contained in:
Mike McQuaid 2018-03-31 13:42:33 +01:00
parent 07997d41e8
commit 49038a2cd9
11 changed files with 9 additions and 50 deletions

View File

@ -25,9 +25,6 @@
#: * `tap` `--repair`: #: * `tap` `--repair`:
#: Migrate tapped formulae from symlink-based to directory-based structure. #: Migrate tapped formulae from symlink-based to directory-based structure.
#: #:
#: * `tap` `--list-official`:
#: List all official taps.
#:
#: * `tap` `--list-pinned`: #: * `tap` `--list-pinned`:
#: List all pinned taps. #: List all pinned taps.
@ -40,8 +37,7 @@ module Homebrew
if ARGV.include? "--repair" if ARGV.include? "--repair"
Tap.each(&:link_completions_and_manpages) Tap.each(&:link_completions_and_manpages)
elsif ARGV.include? "--list-official" elsif ARGV.include? "--list-official"
require "official_taps" odeprecated("brew tap --list-official")
puts OFFICIAL_TAPS.map { |t| "homebrew/#{t}" }
elsif ARGV.include? "--list-pinned" elsif ARGV.include? "--list-pinned"
puts Tap.select(&:pinned?).map(&:name) puts Tap.select(&:pinned?).map(&:name)
elsif ARGV.named.empty? elsif ARGV.named.empty?

View File

@ -15,11 +15,6 @@ describe "brew tap", :integration_test do
.and not_to_output.to_stderr .and not_to_output.to_stderr
.and be_a_success .and be_a_success
expect { brew "tap", "--list-official" }
.to output(%r{homebrew/php}).to_stdout
.and not_to_output.to_stderr
.and be_a_success
expect { brew "tap-info" } expect { brew "tap-info" }
.to output(/2 taps/).to_stdout .to output(/2 taps/).to_stdout
.and not_to_output.to_stderr .and not_to_output.to_stderr

View File

@ -430,11 +430,10 @@ _brew_tap() {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
--*) --*)
__brewcomp "--repair --list-official --list-pinned" __brewcomp "--repair --list-pinned"
return return
;; ;;
esac esac
__brewcomp "$(brew tap --list-official)"
} }
_brew_tap_info() { _brew_tap_info() {
@ -716,7 +715,7 @@ _brew_cask_upgrade ()
return return
;; ;;
esac esac
__brew_cask_complete_outdated __brew_cask_complete_outdated
} }
_brew_cask () _brew_cask ()

View File

@ -56,12 +56,6 @@ __brew_installed_taps() {
_describe -t installed-taps 'installed taps' taps _describe -t installed-taps 'installed taps' taps
} }
__brew_official_taps() {
local -a taps
taps=($(brew tap --list-official))
_describe -t official-taps 'official taps' taps
}
__brew_pinned_taps() { __brew_pinned_taps() {
local -a taps local -a taps
taps=($(brew tap --list-pinned)) taps=($(brew tap --list-pinned))
@ -70,8 +64,7 @@ __brew_pinned_taps() {
__brew_any_tap() { __brew_any_tap() {
_alternative \ _alternative \
'installed-taps:installed taps:__brew_installed_taps' \ 'installed-taps:installed taps:__brew_installed_taps'
'official-taps:official taps:__brew_official_taps'
} }
__brew_common_commands() { __brew_common_commands() {
@ -605,19 +598,15 @@ _brew_switch() {
# brew tap: # brew tap:
# brew tap [--full] user/repo [URL]: # brew tap [--full] user/repo [URL]:
# brew tap --repair: # brew tap --repair:
# brew tap --list-official:
# brew tap --list-pinned: # brew tap --list-pinned:
_brew_tap() { _brew_tap() {
_arguments \ _arguments \
- empty-args \ - empty-args \
- repo-args \ - repo-args \
'(--full)--full[perform a full clone]' \ '(--full)--full[perform a full clone]' \
':repo:__brew_official_taps' \
'::url:_urls' \ '::url:_urls' \
- repair-args \ - repair-args \
'(--repair)--repair' \ '(--repair)--repair' \
- list-official \
'(--list-official)--list-official[list all official taps]' \
- list-pinned \ - list-pinned \
'(--list-pinned)--list-pinned[list all pinned taps]' '(--list-pinned)--list-pinned[list all pinned taps]'
} }

View File

@ -31,7 +31,6 @@ Before submitting a new formula make sure your package:
* meets all our [Acceptable Formulae](Acceptable-Formulae.md) requirements * meets all our [Acceptable Formulae](Acceptable-Formulae.md) requirements
* isn't already in Homebrew (check `brew search <formula>`) * isn't already in Homebrew (check `brew search <formula>`)
* isn't in another official [Homebrew tap](https://github.com/Homebrew)
* isn't already waiting to be merged (check the [issue tracker](https://github.com/Homebrew/homebrew-core/pulls)) * isn't already waiting to be merged (check the [issue tracker](https://github.com/Homebrew/homebrew-core/pulls))
* is still supported by upstream (i.e. doesn't require extensive patching) * is still supported by upstream (i.e. doesn't require extensive patching)
* has a stable, tagged version (i.e. not just a GitHub repository with no versions) * has a stable, tagged version (i.e. not just a GitHub repository with no versions)

View File

@ -25,8 +25,6 @@ Depending on the change you want to make, you need to send the pull request to t
3. Add your pushable forked repository with `git remote add <YOUR_USERNAME> https://github.com/<YOUR_USERNAME>/homebrew-core.git` 3. Add your pushable forked repository with `git remote add <YOUR_USERNAME> https://github.com/<YOUR_USERNAME>/homebrew-core.git`
* `<YOUR_USERNAME>` is your GitHub username, not your local machine username. * `<YOUR_USERNAME>` is your GitHub username, not your local machine username.
For formulae in central taps other than `homebrew/core`, such as `homebrew/php`, substitute that tap's name for `homebrew/core` in each step, and alter the GitHub repository URLs as necessary.
## Create your pull request from a new branch ## Create your pull request from a new branch
To make a new branch and submit it for review, create a GitHub pull request with the following steps: To make a new branch and submit it for review, create a GitHub pull request with the following steps:

View File

@ -16,7 +16,7 @@ repositorys root, or under `Formula` or `HomebrewFormula` subdirectories. We
recommend the latter options because it makes the repository organisation recommend the latter options because it makes the repository organisation
easier to grasp, and top-level files are not mixed with formulae. easier to grasp, and top-level files are not mixed with formulae.
See [homebrew/php](https://github.com/Homebrew/homebrew-php) for an example of See [homebrew/core](https://github.com/Homebrew/homebrew-core) for an example of
a tap with a `Formula` subdirectory. a tap with a `Formula` subdirectory.
### Installing ### Installing

View File

@ -3,15 +3,9 @@
A _tap_ is homebrew-speak for a Git repository containing extra formulae. A _tap_ is homebrew-speak for a Git repository containing extra formulae.
Homebrew has the capability to add (and remove) multiple taps to your local installation with the `brew tap` and `brew untap` commands. Type `man brew` in your Terminal. The main repository [https://github.com/Homebrew/homebrew-core](https://github.com/Homebrew/homebrew-core), often called `homebrew/core`, is always built-in. Homebrew has the capability to add (and remove) multiple taps to your local installation with the `brew tap` and `brew untap` commands. Type `man brew` in your Terminal. The main repository [https://github.com/Homebrew/homebrew-core](https://github.com/Homebrew/homebrew-core), often called `homebrew/core`, is always built-in.
## Main taps Your taps are Git repositories located at `$(brew --repository)/Library/Taps`.
* [homebrew/php](https://github.com/Homebrew/homebrew-php): Repository for PHP-related formulae. ## Unsupported interesting taps
`brew search` looks in these taps as well as in [homebrew/core](https://github.com/Homebrew/homebrew-core) so don't worry about missing stuff.
You can be added as a maintainer for one of the Homebrew organization taps and aid the project! If you are interested please feel free to ask in an issue or pull request after submitting multiple high-quality pull requests. We want your help!
## Other interesting taps
* [denji/nginx](https://github.com/denji/homebrew-nginx): A tap for NGINX modules, intended for its `nginx-full` formula which includes more module options. * [denji/nginx](https://github.com/denji/homebrew-nginx): A tap for NGINX modules, intended for its `nginx-full` formula which includes more module options.
@ -37,12 +31,8 @@ You can be added as a maintainer for one of the Homebrew organization taps and a
* [lifepillar/appleii](https://github.com/lifepillar/homebrew-appleii): Formulae for vintage Apple emulation. * [lifepillar/appleii](https://github.com/lifepillar/homebrew-appleii): Formulae for vintage Apple emulation.
## Interesting forks ## Unsupported interesting forks
* [mistydemeo/tigerbrew](https://github.com/mistydemeo/tigerbrew): Experimental Tiger PowerPC version. * [mistydemeo/tigerbrew](https://github.com/mistydemeo/tigerbrew): Experimental Tiger PowerPC version.
* [Linuxbrew/brew](https://github.com/Linuxbrew/brew): Experimental Linux version. * [Linuxbrew/brew](https://github.com/Linuxbrew/brew): Experimental Linux version.
## Technical details
Your taps are Git repositories located at `$(brew --repository)/Library/Taps`.

View File

@ -474,9 +474,6 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
* `tap` `--repair`: * `tap` `--repair`:
Migrate tapped formulae from symlink-based to directory-based structure. Migrate tapped formulae from symlink-based to directory-based structure.
* `tap` `--list-official`:
List all official taps.
* `tap` `--list-pinned`: * `tap` `--list-pinned`:
List all pinned taps. List all pinned taps.

View File

@ -17,7 +17,7 @@ Follow these steps to fix common problems:
## Check to see if the issue has been reported ## Check to see if the issue has been reported
* Search the [issue tracker](https://github.com/Homebrew/homebrew-core/issues) to see if someone else has already reported the same issue. * Search the [issue tracker](https://github.com/Homebrew/homebrew-core/issues) to see if someone else has already reported the same issue.
* Make sure you search issues on the correct repository. If a formula that has failed to build is part of a tap like [homebrew/php](https://github.com/Homebrew/homebrew-php/issues) or a cask is part of [caskroom/cask](https://github.com/caskroom/homebrew-cask/issues) check those issue trackers instead. * Make sure you search issues on the correct repository. If a formula that has failed to build is part of a non-homebrew-core tap or a cask is part of [caskroom/cask](https://github.com/caskroom/homebrew-cask/issues) check those issue trackers instead.
## Create an issue ## Create an issue

View File

@ -483,10 +483,6 @@ By default, the repository is cloned as a shallow copy (\fB\-\-depth=1\fR), but
Migrate tapped formulae from symlink\-based to directory\-based structure\. Migrate tapped formulae from symlink\-based to directory\-based structure\.
. .
.TP .TP
\fBtap\fR \fB\-\-list\-official\fR
List all official taps\.
.
.TP
\fBtap\fR \fB\-\-list\-pinned\fR \fBtap\fR \fB\-\-list\-pinned\fR
List all pinned taps\. List all pinned taps\.
. .