admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Promote update-bash to the default updater.

Browse Source 
Also, rename the existing updater to `update-ruby` to allow using as
a fallback. It will eventually be removed.

Closes Homebrew/homebrew#49109.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Mike McQuaid 2016-02-12 13:25:37 +00:00
parent b389953f5b
commit 775c4eedd7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/update.rb → Library/Homebrew/cmd/update-ruby.rb
View File

@ -6,7 +6,7 @@ require "formulary"
require "descriptions" require "descriptions"
module Homebrew module Homebrew
def update def update_ruby
unless ARGV.named.empty? unless ARGV.named.empty?
abort <<-EOS.undent abort <<-EOS.undent
This command updates brew itself, and does not take formula names. This command updates brew itself, and does not take formula names.

2
Library/Homebrew/cmd/update-bash.sh → Library/Homebrew/cmd/update.sh
View File

@ -250,7 +250,7 @@ pull() {
trap - SIGINT trap - SIGINT
} }
homebrew-update-bash() { homebrew-update() {
local option local option
local DIR local DIR
local UPSTREAM_BRANCH local UPSTREAM_BRANCH

2
Library/Homebrew/test/test_updater.rb
View File

@ -1,5 +1,5 @@
require "testing_env" require "testing_env"
require "cmd/update" require "cmd/update-ruby"
require "formula_versions" require "formula_versions"
require "yaml" require "yaml"

2
bin/brew
View File

@ -144,7 +144,7 @@ fi
if [[ "$(id -u)" = "0" && "$(/usr/bin/stat -f%u "$HOMEBREW_BREW_FILE")" != "0" ]] if [[ "$(id -u)" = "0" && "$(/usr/bin/stat -f%u "$HOMEBREW_BREW_FILE")" != "0" ]]
then then
case "$HOMEBREW_COMMAND" in case "$HOMEBREW_COMMAND" in
instal|install|reinstall|postinstall|ln|link|pin|update|update-bash|upgrade|create|migrate|tap|switch) instal|install|reinstall|postinstall|ln|link|pin|update|update-ruby|upgrade|create|migrate|tap|switch)
odie <<EOS odie <<EOS
Cowardly refusing to 'sudo brew $HOMEBREW_COMMAND' Cowardly refusing to 'sudo brew $HOMEBREW_COMMAND'
You can use brew with sudo, but only if the brew executable is owned by root. You can use brew with sudo, but only if the brew executable is owned by root.