From 2523a19f70741a0383cd3bc8bedd8c5e52b9b54e Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 13 Feb 2020 18:12:12 -0800 Subject: [PATCH] Omit telemetry message when bootstrapping with `-disableMetrics` (#10061) * Don't show telemetry message when passing --disableMetrics to bootstrap.sh * Don't show telemetry message when passing -disableMetrics to bootstrap-vcpkg.bat --- scripts/bootstrap.ps1 | 5 ++++- scripts/bootstrap.sh | 12 +++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 3817fd6913..1eaf1c5983 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -412,13 +412,16 @@ if ($ec -ne 0) } Write-Host "`nBuilding vcpkg.exe... done.`n" -Write-Host @" +if (-not $disableMetrics) +{ + Write-Host @" Telemetry --------- vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running bootstrap-vcpkg.bat with -disableMetrics. Read more about vcpkg telemetry at docs/about/privacy.md "@ +} Write-Verbose "Placing vcpkg.exe in the correct location" diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 0af6b37ff7..bf8de7897b 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -263,8 +263,10 @@ mkdir -p "$buildDir" rm -rf "$vcpkgRootDir/vcpkg" cp "$buildDir/vcpkg" "$vcpkgRootDir/" -echo "Telemetry" -echo "---------" -echo "vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running bootstrap-vcpkg.sh with -disableMetrics" -echo "Read more about vcpkg telemetry at docs/about/privacy.md" -echo "" \ No newline at end of file +if ! [ "$vcpkgDisableMetrics" = "ON" ]; then + echo "Telemetry" + echo "---------" + echo "vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running bootstrap-vcpkg.sh with -disableMetrics" + echo "Read more about vcpkg telemetry at docs/about/privacy.md" + echo "" +fi