Revert "dont read XDG_RUNTIME_DIR"

joaomoreno · joaomoreno · commit 63bfb446c41b · 2017-10-30T15:13:52.000+01:00
fixes microsoft#22593 This reverts commit 867e521.
diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass.ts
@@ -27,6 +27,10 @@ function getIPCHandlePath(nonce: string): string {
 		return `\\\\.\\pipe\\vscode-git-askpass-${nonce}-sock`;
 	}
 
+	if (process.env['XDG_RUNTIME_DIR']) {
+		return path.join(process.env['XDG_RUNTIME_DIR'], `vscode-git-askpass-${nonce}.sock`);
+	}
+
 	return path.join(os.tmpdir(), `vscode-git-askpass-${nonce}.sock`);
 }
 
diff --git a/src/vs/code/node/shellEnv.ts b/src/vs/code/node/shellEnv.ts
@@ -58,6 +58,9 @@ function getUnixShellEnvironment(): TPromise<typeof process.env> {
 					delete env['ELECTRON_NO_ATTACH_CONSOLE'];
 				}
 
+				// https://github.com/Microsoft/vscode/issues/22593#issuecomment-336050758
+				delete env['XDG_RUNTIME_DIR'];
+
 				c(env);
 			} catch (err) {
 				e(err);
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
@@ -15,7 +15,15 @@ import { memoize } from 'vs/base/common/decorators';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 
+// Read this before there's any chance it is overwritten
+// Related to https://github.com/Microsoft/vscode/issues/30624
+const xdgRuntimeDir = process.env['XDG_RUNTIME_DIR'];
+
 function getNixIPCHandle(userDataPath: string, type: string): string {
+	if (xdgRuntimeDir) {
+		return path.join(xdgRuntimeDir, `${pkg.name}-${pkg.version}-${type}.sock`);
+	}
+
 	return path.join(userDataPath, `${pkg.version}-${type}.sock`);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ function getIPCHandlePath(nonce: string): string {`
`27`	`27`	return `\\\\.\\pipe\\vscode-git-askpass-${nonce}-sock`;
`28`	`28`	`}`
`29`	`29`
	`30`	`+ if (process.env['XDG_RUNTIME_DIR']) {`
	`31`	+ return path.join(process.env['XDG_RUNTIME_DIR'], `vscode-git-askpass-${nonce}.sock`);
	`32`	`+ }`
	`33`	`+`
`30`	`34`	return path.join(os.tmpdir(), `vscode-git-askpass-${nonce}.sock`);
`31`	`35`	`}`
`32`	`36`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ function getUnixShellEnvironment(): TPromise<typeof process.env> {`
`58`	`58`	`delete env['ELECTRON_NO_ATTACH_CONSOLE'];`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ // https://github.com/Microsoft/vscode/issues/22593#issuecomment-336050758`
	`62`	`+ delete env['XDG_RUNTIME_DIR'];`
	`63`	`+`
`61`	`64`	`c(env);`
`62`	`65`	`} catch (err) {`
`63`	`66`	`e(err);`