aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/bootstrap.ps110
-rw-r--r--scripts/bootstrap.sh16
2 files changed, 18 insertions, 8 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 8603647b3..dac97621f 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -341,7 +341,7 @@ if ($disableMetrics)
$platform = "x86"
$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release"
if($PSVersionTable.PSVersion.Major -le 2)
-{
+{
$architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture
}
else
@@ -417,9 +417,13 @@ 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
+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 the bootstrap-vcpkg script with -disableMetrics,
+passing --disable-metrics to vcpkg on the command line,
+or by setting the VCPKG_DISABLE_METRICS environment variable.
+Read more about vcpkg telemetry at docs/about/privacy.md
"@
}
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index d45305fb5..321a16e05 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -256,9 +256,15 @@ rm -rf "$vcpkgRootDir/vcpkg"
cp "$buildDir/vcpkg" "$vcpkgRootDir/"
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 ""
+ cat <<EOF
+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 the bootstrap-vcpkg script with -disableMetrics,
+passing --disable-metrics to vcpkg on the command line,
+or by setting the VCPKG_DISABLE_METRICS environment variable.
+
+Read more about vcpkg telemetry at docs/about/privacy.md
+EOF
fi