diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh index d11379064f..a9a689ae6d 100644 --- a/Library/Contributions/brew_bash_completion.sh +++ b/Library/Contributions/brew_bash_completion.sh @@ -374,7 +374,7 @@ _brew () done if [[ $i -eq $COMP_CWORD ]]; then - local ext=$(\ls $(brew --repository)/Library/Contributions/examples \ + local ext=$(\ls $(brew --repository)/Library/Contributions/cmds \ 2>/dev/null | sed -e "s/\.rb//g" -e "s/brew-//g") __brewcomp " --cache --cellar --config diff --git a/Library/Contributions/examples/brew-beer.rb b/Library/Contributions/cmds/brew-beer.rb similarity index 100% rename from Library/Contributions/examples/brew-beer.rb rename to Library/Contributions/cmds/brew-beer.rb diff --git a/Library/Contributions/examples/brew-dirty.rb b/Library/Contributions/cmds/brew-dirty.rb similarity index 100% rename from Library/Contributions/examples/brew-dirty.rb rename to Library/Contributions/cmds/brew-dirty.rb diff --git a/Library/Contributions/examples/brew-graph b/Library/Contributions/cmds/brew-graph similarity index 100% rename from Library/Contributions/examples/brew-graph rename to Library/Contributions/cmds/brew-graph diff --git a/Library/Contributions/examples/brew-grep b/Library/Contributions/cmds/brew-grep similarity index 100% rename from Library/Contributions/examples/brew-grep rename to Library/Contributions/cmds/brew-grep diff --git a/Library/Contributions/examples/brew-leaves.rb b/Library/Contributions/cmds/brew-leaves.rb similarity index 100% rename from Library/Contributions/examples/brew-leaves.rb rename to Library/Contributions/cmds/brew-leaves.rb diff --git a/Library/Contributions/examples/brew-linkapps.rb b/Library/Contributions/cmds/brew-linkapps.rb similarity index 100% rename from Library/Contributions/examples/brew-linkapps.rb rename to Library/Contributions/cmds/brew-linkapps.rb diff --git a/Library/Contributions/examples/brew-man b/Library/Contributions/cmds/brew-man similarity index 100% rename from Library/Contributions/examples/brew-man rename to Library/Contributions/cmds/brew-man diff --git a/Library/Contributions/examples/brew-mirror-check.rb b/Library/Contributions/cmds/brew-mirror-check.rb similarity index 100% rename from Library/Contributions/examples/brew-mirror-check.rb rename to Library/Contributions/cmds/brew-mirror-check.rb diff --git a/Library/Contributions/examples/brew-missing.rb b/Library/Contributions/cmds/brew-missing.rb similarity index 100% rename from Library/Contributions/examples/brew-missing.rb rename to Library/Contributions/cmds/brew-missing.rb diff --git a/Library/Contributions/examples/brew-pull.rb b/Library/Contributions/cmds/brew-pull.rb similarity index 100% rename from Library/Contributions/examples/brew-pull.rb rename to Library/Contributions/cmds/brew-pull.rb diff --git a/Library/Contributions/examples/brew-readall.rb b/Library/Contributions/cmds/brew-readall.rb similarity index 100% rename from Library/Contributions/examples/brew-readall.rb rename to Library/Contributions/cmds/brew-readall.rb diff --git a/Library/Contributions/examples/brew-server b/Library/Contributions/cmds/brew-server similarity index 100% rename from Library/Contributions/examples/brew-server rename to Library/Contributions/cmds/brew-server diff --git a/Library/Contributions/examples/brew-switch.rb b/Library/Contributions/cmds/brew-switch.rb similarity index 100% rename from Library/Contributions/examples/brew-switch.rb rename to Library/Contributions/cmds/brew-switch.rb diff --git a/Library/Contributions/examples/brew-unpack.rb b/Library/Contributions/cmds/brew-unpack.rb similarity index 100% rename from Library/Contributions/examples/brew-unpack.rb rename to Library/Contributions/cmds/brew-unpack.rb diff --git a/Library/Contributions/examples/brew-which.rb b/Library/Contributions/cmds/brew-which.rb similarity index 100% rename from Library/Contributions/examples/brew-which.rb rename to Library/Contributions/cmds/brew-which.rb diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md index 0dd115f325..a59eaecba7 100644 --- a/Library/Contributions/manpages/brew.1.md +++ b/Library/Contributions/manpages/brew.1.md @@ -322,10 +322,10 @@ scripts that reside somewhere in the PATH, named `brew-` or `brew-.rb`, which can be invoked like `brew cmdname`. This allows you to create your own commands without modifying Homebrew's internals. -A number of (useful, but unsupported) example commands are included and enabled +A number of (useful, but unsupported) external commands are included and enabled by default: - $ ls `brew --repository`/Library/Contributions/examples + $ ls `brew --repository`/Library/Contributions/cmds Documentation for the included external commands as well as instructions for creating your own can be found on the wiki: diff --git a/bin/brew b/bin/brew index e5a5e685ef..ba573c6583 100755 --- a/bin/brew +++ b/bin/brew @@ -71,7 +71,7 @@ begin cmd = aliases[cmd] if aliases[cmd] # Add example external commands to PATH before checking. - ENV['PATH'] += ":#{HOMEBREW_REPOSITORY}/Library/Contributions/examples" + ENV['PATH'] += ":#{HOMEBREW_REPOSITORY}/Library/Contributions/cmds" if system "/usr/bin/which -s brew-#{cmd}" %w[CACHE CELLAR LIBRARY_PATH PREFIX REPOSITORY].each do |e| ENV["HOMEBREW_#{e}"] = Object.const_get "HOMEBREW_#{e}" diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1 index ea060c289d..2a8b25dd62 100644 --- a/share/man/man1/brew.1 +++ b/share/man/man1/brew.1 @@ -353,13 +353,13 @@ Print the version number of brew to standard error and exit\. Homebrew, like \fBgit\fR(1), supports external commands\. These are executable scripts that reside somewhere in the PATH, named \fBbrew\-\fR or \fBbrew\-\.rb\fR, which can be invoked like \fBbrew cmdname\fR\. This allows you to create your own commands without modifying Homebrew\'s internals\. . .P -A number of (useful, but unsupported) example commands are included and enabled by default: +A number of (useful, but unsupported) external commands are included and enabled by default: . .IP "" 4 . .nf -$ ls `brew \-\-repository`/Library/Contributions/examples +$ ls `brew \-\-repository`/Library/Contributions/cmds . .fi .