diff --git a/src/main.ts b/src/main.ts index 08f03d94..e11843f3 100644 --- a/src/main.ts +++ b/src/main.ts @@ -117,7 +117,7 @@ module.exports = function (argv: string[]): void { .option('--allow-star-activation', 'Allow using * in activation events') .option('--allow-missing-repository', 'Allow missing a repository URL in package.json') .option('--skip-license', 'Allow packaging without license file') - .option('--signtool', 'Path to the VSIX signing tool. Will be invoked with two arguments: `SIGNTOOL `.') + .option('--sign-tool', 'Path to the VSIX signing tool. Will be invoked with two arguments: `SIGNTOOL `.') .action( ( version, @@ -144,7 +144,7 @@ module.exports = function (argv: string[]): void { allowStarActivation, allowMissingRepository, skipLicense, - sign, + signTool, } ) => main( @@ -172,7 +172,7 @@ module.exports = function (argv: string[]): void { allowStarActivation, allowMissingRepository, skipLicense, - sign, + signTool, }) ) ); @@ -198,7 +198,7 @@ module.exports = function (argv: string[]): void { .option('--no-update-package-json', 'Do not update `package.json`. Valid only when [version] is provided.') .option('-i, --packagePath ', 'Publish the provided VSIX packages.') .option('--sigzipPath ', 'Signature archives to publish alongside the VSIX packages.') - .option('--sign', 'Script to sign the VSIX package. VSIX manifest will be passed as an argument. This will be ignored if --sigzipPath is provided.') + .option('--sign-tool', 'Path to the VSIX signing tool. Will be invoked with two arguments: `SIGNTOOL `. This will be ignored if --sigzipPath is provided.') .option( '--githubBranch ', 'The GitHub branch used to infer relative links in README.md. Can be overridden by --baseContentUrl and --baseImagesUrl.' @@ -253,7 +253,7 @@ module.exports = function (argv: string[]): void { allowMissingRepository, skipDuplicate, skipLicense, - sign, + signTool, } ) => main( @@ -285,7 +285,7 @@ module.exports = function (argv: string[]): void { allowMissingRepository, skipDuplicate, skipLicense, - sign + signTool }) ) ); diff --git a/src/package.ts b/src/package.ts index c6c354b6..698ce527 100644 --- a/src/package.ts +++ b/src/package.ts @@ -153,7 +153,7 @@ export interface IPackageOptions { readonly allowMissingRepository?: boolean; readonly skipLicense?: boolean; - readonly sign?: string; + readonly signTool?: string; } export interface IProcessor { @@ -1867,8 +1867,8 @@ export async function packageCommand(options: IPackageOptions = {}): Promise { @@ -119,8 +119,8 @@ export async function publish(options: IPublishOptions = {}): Promise { validateMarketplaceRequirements(vsix.manifest, options); let sigzipPath = options.sigzipPath?.[index]; - if (!sigzipPath && options.sign) { - sigzipPath = await signPackage(packagePath, options.sign); + if (!sigzipPath && options.signTool) { + sigzipPath = await signPackage(packagePath, options.signTool); } @@ -141,13 +141,13 @@ export async function publish(options: IPublishOptions = {}): Promise { for (const target of options.targets) { const packagePath = await tmpName(); const packageResult = await pack({ ...options, target, packagePath }); - const sigzipPath = options.sign ? await signPackage(packagePath, options.sign) : undefined; + const sigzipPath = options.signTool ? await signPackage(packagePath, options.signTool) : undefined; await _publish(packagePath, sigzipPath, packageResult.manifest, { ...options, target }); } } else { const packagePath = await tmpName(); const packageResult = await pack({ ...options, packagePath }); - const sigzipPath = options.sign ? await signPackage(packagePath, options.sign) : undefined; + const sigzipPath = options.signTool ? await signPackage(packagePath, options.signTool) : undefined; await _publish(packagePath, sigzipPath, packageResult.manifest, options); } }