mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
Don't touch fish args as they remain when injected
This commit is contained in:
parent
cc99bb094b
commit
4488b736e4
|
@ -161,17 +161,10 @@ export function getShellIntegrationInjection(
|
|||
return { newArgs, envMixin };
|
||||
}
|
||||
case 'fish': {
|
||||
if (!originalArgs || originalArgs.length === 0) {
|
||||
newArgs = [];
|
||||
} else if (Array.isArray(originalArgs)) {
|
||||
newArgs = originalArgs;
|
||||
} else {
|
||||
newArgs = [originalArgs];
|
||||
}
|
||||
const oldDataDirs = env?.XDG_DATA_DIRS ?? '/usr/local/share:/usr/share';
|
||||
const newDataDir = path.join(appRoot, 'out/vs/workbench/contrib/xdg_data');
|
||||
envMixin['XDG_DATA_DIRS'] = `${oldDataDirs}:${newDataDir}`;
|
||||
return { newArgs, envMixin };
|
||||
return { newArgs: undefined, envMixin };
|
||||
}
|
||||
case 'pwsh': {
|
||||
if (!originalArgs || arePwshImpliedArgs(originalArgs)) {
|
||||
|
|
Loading…
Reference in a new issue