fixes #74130
This commit is contained in:
parent
edd560d278
commit
b81b3cd58e
|
@ -21,7 +21,9 @@ import { URI } from 'vs/base/common/uri';
|
||||||
const xdgRuntimeDir = process.env['XDG_RUNTIME_DIR'];
|
const xdgRuntimeDir = process.env['XDG_RUNTIME_DIR'];
|
||||||
|
|
||||||
function getNixIPCHandle(userDataPath: string, type: string): string {
|
function getNixIPCHandle(userDataPath: string, type: string): string {
|
||||||
if (xdgRuntimeDir) {
|
const vscodePortable = process.env['VSCODE_PORTABLE'];
|
||||||
|
|
||||||
|
if (xdgRuntimeDir && !vscodePortable) {
|
||||||
const scope = crypto.createHash('md5').update(userDataPath).digest('hex').substr(0, 8);
|
const scope = crypto.createHash('md5').update(userDataPath).digest('hex').substr(0, 8);
|
||||||
return path.join(xdgRuntimeDir, `vscode-${scope}-${pkg.version}-${type}.sock`);
|
return path.join(xdgRuntimeDir, `vscode-${scope}-${pkg.version}-${type}.sock`);
|
||||||
}
|
}
|
||||||
|
@ -93,6 +95,7 @@ export class EnvironmentService implements IEnvironmentService {
|
||||||
@memoize
|
@memoize
|
||||||
get userDataPath(): string {
|
get userDataPath(): string {
|
||||||
const vscodePortable = process.env['VSCODE_PORTABLE'];
|
const vscodePortable = process.env['VSCODE_PORTABLE'];
|
||||||
|
|
||||||
if (vscodePortable) {
|
if (vscodePortable) {
|
||||||
return path.join(vscodePortable, 'user-data');
|
return path.join(vscodePortable, 'user-data');
|
||||||
}
|
}
|
||||||
|
@ -170,6 +173,7 @@ export class EnvironmentService implements IEnvironmentService {
|
||||||
}
|
}
|
||||||
|
|
||||||
const vscodePortable = process.env['VSCODE_PORTABLE'];
|
const vscodePortable = process.env['VSCODE_PORTABLE'];
|
||||||
|
|
||||||
if (vscodePortable) {
|
if (vscodePortable) {
|
||||||
return path.join(vscodePortable, 'extensions');
|
return path.join(vscodePortable, 'extensions');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue