maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

drop install-vsix altogether

Browse source
This commit is contained in:
Joao Moreno 2016-09-15 18:24:46 +02:00
parent b3f39bf739
commit dc172cddf8
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/code/node/cliProcessMain.ts
View file

@ -56,8 +56,8 @@ class Main {
return this.listExtensions();
} else if (argv['install-extension']) {
const arg = argv['install-extension'];
const ids: string[] = typeof arg === 'string' ? [arg] : arg;
return this.installExtension(ids);
const args: string[] = typeof arg === 'string' ? [arg] : arg;
return this.installExtension(args);
} else if (argv['uninstall-extension']) {
const arg = argv['uninstall-extension'];
const ids: string[] = typeof arg === 'string' ? [arg] : arg;

7
src/vs/code/node/sharedProcessMain.ts
View file

@ -8,7 +8,6 @@ import * as platform from 'vs/base/common/platform';
import product from 'vs/platform/product';
import pkg from 'vs/platform/package';
import { serve, Server, connect } from 'vs/base/parts/ipc/node/ipc.net';
import { coalesce } from 'vs/base/common/arrays';
import { TPromise } from 'vs/base/common/winjs.base';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
@ -104,18 +103,12 @@ function main(server: Server, initData: ISharedProcessInitData): void {
const instantiationService2 = instantiationService.createChild(services);
instantiationService2.invokeFunction(accessor => {
const environmentService = accessor.get(IEnvironmentService);
const extensionManagementService = accessor.get(IExtensionManagementService);
const channel = new ExtensionManagementChannel(extensionManagementService);
server.registerChannel('extensions', channel);
// clean up deprecated extensions
(extensionManagementService as ExtensionManagementService).removeDeprecatedExtensions();
// install vsix
const vsixArg = environmentService.args['install-vsix'];
const vsix = typeof vsixArg === 'string' ? [vsixArg] : vsixArg;
coalesce(vsix || []).forEach(vsix => extensionManagementService.install(vsix));
});
});
}

2
src/vs/platform/environment/node/argv.ts
View file

@ -31,7 +31,6 @@ export interface ParsedArgs extends minimist.ParsedArgs {
'list-extensions'?: boolean;
'install-extension'?: string | string[];
'uninstall-extension'?: string | string[];
'install-vsix'?: string | string[];
}
const options: minimist.Opts = {
@ -43,7 +42,6 @@ const options: minimist.Opts = {
'extensionTestsPath',
'install-extension',
'uninstall-extension',
'install-vsix',
'debugBrkPluginHost',
'debugPluginHost'
],