diff options
| author | Mike McQuaid | 2016-10-03 18:38:46 +0100 |
|---|---|---|
| committer | GitHub | 2016-10-03 18:38:46 +0100 |
| commit | 881fdcd25ebe6b91691295034a8d9fa2dfc6f158 (patch) | |
| tree | a8d219e84fa831c00625010acc72a364e780c504 | |
| parent | ea5aff8d7cdf893207fde9457364bde3b8e5ae82 (diff) | |
| parent | d92a1ad58434fdb6852405f28ae54494083471b0 (diff) | |
| download | brew-881fdcd25ebe6b91691295034a8d9fa2dfc6f158.tar.bz2 | |
Merge pull request #1190 from vladshablinsky/no-autoupdate-on-help
brew.sh: don't autoupdate if --help passed
| -rw-r--r-- | Library/Homebrew/brew.rb | 9 | ||||
| -rw-r--r-- | Library/Homebrew/brew.sh | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb index 985a93de9..4ab360995 100644 --- a/Library/Homebrew/brew.rb +++ b/Library/Homebrew/brew.rb @@ -32,20 +32,17 @@ begin empty_argv = ARGV.empty? help_flag_list = %w[-h --help --usage -?] - help_flag = false + help_flag = !ENV["HOMEBREW_HELP"].nil? internal_cmd = true cmd = nil ARGV.dup.each_with_index do |arg, i| break if help_flag && cmd - if help_flag_list.include?(arg) - # Option-style help: Both `--help <cmd>` and `<cmd> --help` are fine. - help_flag = true - elsif arg == "help" && !cmd + if arg == "help" && !cmd # Command-style help: `help <cmd>` is fine, but `<cmd> help` is not. help_flag = true - elsif !cmd + elsif !cmd && !help_flag_list.include?(arg) cmd = ARGV.delete_at(i) end end diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 1ccd8832a..8ffee44b3 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -183,6 +183,15 @@ then set -- "$@" -v fi +for arg in "$@" +do + if [[ $arg = "--help" || $arg = "-h" || $arg = "--usage" || $arg = "-?" ]] + then + export HOMEBREW_HELP="1" + break + fi +done + HOMEBREW_ARG_COUNT="$#" HOMEBREW_COMMAND="$1" shift @@ -272,6 +281,7 @@ setup-analytics report-analytics-screenview-command update-preinstall() { + [[ -z "$HOMEBREW_HELP" ]] || return [[ -z "$HOMEBREW_NO_AUTO_UPDATE" ]] || return [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return |