Pārlūkot izejas kodu

Change default telemetry settings to disabled (#46)

Closes #44
Joel Wasserman 6 gadi atpakaļ
vecāks
revīzija
74d06bf01d
3 mainītis faili ar 15 papildinājumiem un 4 dzēšanām
  1. 4 2
      README.md
  2. 2 2
      build.sh
  3. 9 0
      update_settings.sh

+ 4 - 2
README.md

@@ -52,9 +52,11 @@ Microsoft's build process does download additional files. This was brought up in
   - ffmpeg
 
 ## <a id="disable-telemetry"></a>Getting all the Telemetry Out
-Even though we do not pass the telemetry build flags (and go out of our way to cripple the baked-in telemetry), Microsoft will still track usage by default. After installing VSCodium, you must manually disable telemetry in your settings file to stop it from sending tracking data to Microsoft. 
+Even though we do not pass the telemetry build flags (and go out of our way to cripple the baked-in telemetry), Microsoft will still track usage by default.
 
-The instructions [here](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting) and [here](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-crash-reporting) help with disabling telemetry. 
+We do however set the default `telemetry.enableCrashReporter` and `telemetry.enableTelemetry` values to false. You can see those by viewing your VSCodium settings.json and searching for `telemetry`.
+
+The instructions [here](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting) and [here](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-crash-reporting) help with explaining and toggling telemetry. 
 
 It is also highly recommended that you review all the settings that "use online services" by following [these instructions](https://code.visualstudio.com/docs/supporting/faq#_managing-online-services). The `@tag:usesOnlineServices` filter on the settings page will show that by default:
 - Extensions auto check for updates and auto install updates

+ 2 - 2
build.sh

@@ -8,6 +8,8 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     export npm_config_arch=ia32
   fi
 
+  ../update_settings.sh
+
   yarn
   mv product.json product.json.bak
   cat product.json.bak | jq 'setpath(["extensionsGallery"]; {"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "itemUrl": "https://marketplace.visualstudio.com/items"}) | setpath(["nameShort"]; "VSCodium") | setpath(["nameLong"]; "VSCodium") | setpath(["applicationName"]; "vscodium") | setpath(["win32MutexName"]; "vscodium") | setpath(["win32DirName"]; "VSCodium") | setpath(["win32NameVersion"]; "VSCodium") | setpath(["win32RegValueName"]; "VSCodium") | setpath(["win32AppUserModelId"]; "Microsoft.VSCodium") | setpath(["win32ShellNameShort"]; "V&SCodium") | setpath(["urlProtocol"]; "vscodium")' > product.json
@@ -40,6 +42,4 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     npm run gulp vscode-linux-x64-build-deb
     npm run gulp vscode-linux-x64-build-rpm
   fi
-
-  cd ..
 fi

+ 9 - 0
update_settings.sh

@@ -0,0 +1,9 @@
+REPLACEMENT="s/'default': true/'default': false/"
+
+if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+  sed -i '' -E "$REPLACEMENT" src/vs/platform/telemetry/common/telemetryService.ts
+  sed -i '' -E "$REPLACEMENT" src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
+else
+  sed -i -E "$REPLACEMENT" src/vs/platform/telemetry/common/telemetryService.ts
+  sed -i -E "$REPLACEMENT" src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
+fi