fix: leave behind the unmodified XDG_CURRENT_DESKTOP variable (electron#23553)

trop[bot] · MarshallOfSound · web-flow · commit 5990d3404feb · 2020-05-14T09:48:42.000-04:00
Co-authored-by: Samuel Attard &lt;sattard@slack-corp.com&gt;
diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
@@ -123,3 +123,14 @@ the one downloaded by `npm install`. Usage:
 ```sh
 export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Debug
 ```
+
+## Set By Electron
+
+Electron sets some variables in your environment at runtime.
+
+### `ORIGINAL_XDG_CURRENT_DESKTOP`
+
+This variable is set to the value of `XDG_CURRENT_DESKTOP` that your application
+originally launched with.  Electron sometimes modifies the value of `XDG_CURRENT_DESKTOP`
+to affect other logic within Chromium so if you want access to the _original_ value
+you should look up this environment variable instead.
diff --git a/lib/browser/init.ts b/lib/browser/init.ts
@@ -178,6 +178,7 @@ function currentPlatformSupportsAppIndicator () {
 }
 
 // Workaround for electron/electron#5050 and electron/electron#9046
+process.env.ORIGINAL_XDG_CURRENT_DESKTOP = process.env.XDG_CURRENT_DESKTOP;
 if (currentPlatformSupportsAppIndicator()) {
   process.env.XDG_CURRENT_DESKTOP = 'Unity';
 }

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,7 @@ function currentPlatformSupportsAppIndicator () {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`// Workaround for electron/electron#5050 and electron/electron#9046`
	`181`	`+process.env.ORIGINAL_XDG_CURRENT_DESKTOP = process.env.XDG_CURRENT_DESKTOP;`
`181`	`182`	`if (currentPlatformSupportsAppIndicator()) {`
`182`	`183`	`process.env.XDG_CURRENT_DESKTOP = 'Unity';`
`183`	`184`	`}`