@@ -29857,10 +29857,10 @@ class GpgCli {
2985729857 }
2985829858 }
2985929859 async import(ascPath) {
29860- await execOutput(this.name, ['--import', ascPath]);
29860+ await execOutput(this.name, ['--import', ascPath], { silent: false, failOnStdErr: false } );
2986129861 }
2986229862 async verify(sigPath, binPath) {
29863- await execOutput(this.name, ['--verify', sigPath, binPath]);
29863+ await execOutput(this.name, ['--verify', sigPath, binPath], { silent: false, failOnStdErr: false } );
2986429864 }
2986529865 async help() {
2986629866 const { stdout } = await execOutput(this.name, ['--help']);
@@ -29914,6 +29914,10 @@ class TrdlCli {
2991429914 const { stdout } = await execOutput(this.name, ['list']);
2991529915 return stdout.slice(1).map(parseLineToItem);
2991629916 }
29917+ async version() {
29918+ const { stdout } = await execOutput(this.name, ['version'], { silent: false });
29919+ return stdout.join('');
29920+ }
2991729921}
2991829922function parseLineToItem(line) {
2991929923 const [name, url, default_, channel] = line.trim().split(/ +/);
@@ -30007,18 +30011,19 @@ async function installTrdl(toolName, toolVersion, binPath) {
3000730011 coreExports.addPath(installedPath);
3000830012}
3000930013async function Run() {
30014+ coreExports.setCommandEcho(coreExports.isDebug());
3001030015 const trdlCli = new TrdlCli();
3001130016 const gpgCli = new GpgCli();
3001230017 const inputs = parseInputs();
3001330018 await Do(trdlCli, gpgCli, inputs);
3001430019}
3001530020async function Do(trdlCli, gpgCli, inputs) {
3001630021 coreExports.startGroup('Install or self-update trdl.');
30017- coreExports.debug (format(`parsed inputs=%o`, inputs));
30022+ coreExports.info (format(`parsed inputs=%o`, inputs));
3001830023 const defaults = trdlCli.defaults();
30019- coreExports.debug (format(`trdl defaults=%o`, defaults));
30024+ coreExports.info (format(`trdl defaults=%o`, defaults));
3002030025 const options = await getOptions(inputs, defaults);
30021- coreExports.debug (format(`installation options=%o`, options));
30026+ coreExports.info (format(`installation options=%o`, options));
3002230027 const toolCache = findTrdlCache(defaults.repo, options.version);
3002330028 if (toolCache) {
3002430029 coreExports.info(`Installation skipped. trdl@v${options.version} is found at path ${toolCache}.`);
@@ -30030,16 +30035,19 @@ async function Do(trdlCli, gpgCli, inputs) {
3003030035 }
3003130036 await gpgCli.mustGnuGP();
3003230037 const [binUrl, sigUrl, ascUrl] = formatDownloadUrls(options.version);
30033- coreExports.debug (format('%s bin_url =%s', defaults.repo, binUrl));
30034- coreExports.debug (format('%s sig_url =%s', defaults.repo, sigUrl));
30035- coreExports.debug (format('%s asc_url =%s', defaults.repo, ascUrl));
30036- coreExports.info('Downloading signatures.');
30038+ coreExports.info (format('%s binUrl =%s', defaults.repo, binUrl));
30039+ coreExports.info (format('%s sigUrl =%s', defaults.repo, sigUrl));
30040+ coreExports.info (format('%s ascUrl =%s', defaults.repo, ascUrl));
30041+ coreExports.info('Downloading binary and signatures.');
3003730042 const [binPath, sigPath, ascPath] = await downloadParallel(binUrl, sigUrl, ascUrl);
3003830043 coreExports.info('Importing and verifying gpg keys.');
3003930044 await gpgCli.import(ascPath);
3004030045 await gpgCli.verify(sigPath, binPath);
3004130046 coreExports.info('Installing trdl and adding it to the $PATH.');
3004230047 await installTrdl(defaults.repo, options.version, binPath);
30048+ coreExports.info('Showing installed version.');
30049+ const version = await trdlCli.version();
30050+ coreExports.info(format('Installed version: trdl@%s', version));
3004330051 coreExports.endGroup();
3004430052}
3004530053
0 commit comments