More analytics tweaks.

Provide a single command that can be run to disable analytics, run it if
`HOMEBREW_NO_ANALYTICS` is ever set and remove the user UUID file in
that case too.

References https://github.com/Homebrew/brew/issues/142.

1 files changed, 5 insertions, 4 deletions

diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 55b7bdd27..9d0377cb5 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -13,10 +13,11 @@ module Homebrew
 
   def update_report
     HOMEBREW_REPOSITORY.cd do
-      key = "homebrew.analyticsmessage"
       analytics_message_displayed = \
-        Utils.popen_read("git", "config", "--local", "--get", key).chuzzle
-      unless analytics_message_displayed == "true"
+        Utils.popen_read("git", "config", "--local", "--get", "homebrew.analyticsmessage").chuzzle
+      analytics_disabled = \
+        Utils.popen_read("git", "config", "--local", "--get", "homebrew.analyticsdisabled").chuzzle
+      if analytics_message_displayed != "true" && analytics_disabled != "true"
         ENV["HOMEBREW_NO_ANALYTICS"] = "1"
         ohai "Homebrew has enabled anonymous aggregate user behaviour analytics"
         puts "Read the analytics documentation (and how to opt-out) here:"
@@ -24,7 +25,7 @@ module Homebrew
 
         # Consider the message possibly missed if not a TTY.
         if $stdout.tty?
-          safe_system "git", "config", "--local", "--replace-all", key, "true"
+          safe_system "git", "config", "--local", "--replace-all", "homebrew.analyticsmessage", "true"
         end
       end
     end