diff options
Diffstat (limited to 'Library/Homebrew/utils')
| -rw-r--r-- | Library/Homebrew/utils/analytics.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/utils/analytics.sh | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb index caf2a15c1..32ea22f89 100644 --- a/Library/Homebrew/utils/analytics.rb +++ b/Library/Homebrew/utils/analytics.rb @@ -8,7 +8,7 @@ def analytics_label end def report_analytics(type, metadata = {}) - return if ENV["HOMEBREW_NO_ANALYTICS"] + return if ENV["HOMEBREW_NO_ANALYTICS"] || ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] args = %W[ --max-time 3 diff --git a/Library/Homebrew/utils/analytics.sh b/Library/Homebrew/utils/analytics.sh index 70e698f7c..3c6fc59a0 100644 --- a/Library/Homebrew/utils/analytics.sh +++ b/Library/Homebrew/utils/analytics.sh @@ -3,12 +3,19 @@ setup-analytics() { # recreated with no adverse effect (beyond our user counts being inflated). HOMEBREW_ANALYTICS_USER_UUID_FILE="$HOME/.homebrew_analytics_user_uuid" - if [[ -n "$HOMEBREW_NO_ANALYTICS" || - "$(git config --file="$HOMEBREW_REPOSITORY/.git/config" --get homebrew.analyticsmessage)" != "true" || + # Make disabling anlytics sticky + if [[ -n "$HOMEBREW_NO_ANALYTICS" ]] + then + git config --file="$HOMEBREW_REPOSITORY/.git/config" --replace-all homebrew.analyticsdisabled true + # Internal variable for brew's use, to differentiate from user-supplied setting + export HOMEBREW_NO_ANALYTICS_THIS_RUN="1" + fi + + if [[ "$(git config --file="$HOMEBREW_REPOSITORY/.git/config" --get homebrew.analyticsmessage)" != "true" || "$(git config --file="$HOMEBREW_REPOSITORY/.git/config" --get homebrew.analyticsdisabled)" = "true" ]] then [[ -f "$HOMEBREW_ANALYTICS_USER_UUID_FILE" ]] && rm -f "$HOMEBREW_ANALYTICS_USER_UUID_FILE" - export HOMEBREW_NO_ANALYTICS="1" + export HOMEBREW_NO_ANALYTICS_THIS_RUN="1" return fi @@ -34,7 +41,7 @@ setup-analytics() { } report-analytics-screenview-command() { - [[ -n "$HOMEBREW_NO_ANALYTICS" ]] && return + [[ -n "$HOMEBREW_NO_ANALYTICS" || -n "$HOMEBREW_NO_ANALYTICS_THIS_RUN" ]] && return # Don't report non-official commands. if ! [[ "$HOMEBREW_COMMAND" = "bundle" || |