oclif 3.3.0 → 3.4.0

package/.oclif.manifest.json

@@ -1 +1 @@
-{"version":"3.3.0","commands":{"generate":{"id":"generate","description":"generate a new CLI\nThis will clone the template repo 'oclif/hello-world' and update package properties","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"name","description":"directory name of new project","required":true}]},"manifest":{"id":"manifest","description":"generates plugin manifest json","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"path to plugin","default":"."}]},"promote":{"id":"promote","description":"promote CLI builds to a S3 release channel","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to the oclif CLI project root","required":true,"multiple":false,"default":"."},"version":{"name":"version","type":"option","description":"semantic version of the CLI to promote","required":true,"multiple":false},"sha":{"name":"sha","type":"option","description":"7-digit short git commit SHA of the CLI to promote","required":true,"multiple":false},"channel":{"name":"channel","type":"option","description":"which channel to promote to","required":true,"multiple":false,"default":"stable"},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to promote (e.g.: linux-arm,win32-x64)","multiple":false},"deb":{"name":"deb","type":"boolean","char":"d","description":"promote debian artifacts","allowNo":false},"macos":{"name":"macos","type":"boolean","char":"m","description":"promote macOS pkg","allowNo":false},"win":{"name":"win","type":"boolean","char":"w","description":"promote Windows exe","allowNo":false},"max-age":{"name":"max-age","type":"option","char":"a","description":"cache control max-age in seconds","multiple":false,"default":"86400"},"xz":{"name":"xz","type":"boolean","description":"also upload xz","allowNo":true},"indexes":{"name":"indexes","type":"boolean","description":"append the promoted urls into the index files","allowNo":false}},"args":[]},"readme":{"id":"readme","description":"adds commands to README.md in current directory\nThe readme must have any of the following tags inside of it for it to be replaced or else it will do nothing:\n# Usage\n<!-- usage -->\n# Commands\n<!-- commands -->\n# Table of contents\n<!-- toc -->\n\nCustomize the code URL prefix by setting oclif.repositoryPrefix in package.json.\n","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"output directory for multi docs","required":true,"multiple":false,"default":"docs"},"multi":{"name":"multi","type":"boolean","description":"create a different markdown page for each topic","allowNo":false},"aliases":{"name":"aliases","type":"boolean","description":"include aliases in the command list","allowNo":true}},"args":[]},"generate:command":{"id":"generate:command","description":"add a command to an existing CLI or plugin","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"name","description":"name of command","required":true}]},"generate:hook":{"id":"generate:hook","description":"add a hook to an existing CLI or plugin","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false},"event":{"name":"event","type":"option","description":"event to run hook on","multiple":false,"default":"init"}},"args":[{"name":"name","description":"name of hook (snake_case)","required":true}]},"pack:deb":{"id":"pack:deb","description":"pack CLI into debian package","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"args":[]},"pack:macos":{"id":"pack:macos","description":"pack CLI into macOS .pkg","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"additional-cli":{"name":"additional-cli","type":"option","description":"an Oclif CLI other than the one listed in config.bin that should be made available to the user\nthe CLI should already exist in a directory named after the CLI that is the root of the tarball produced by \"oclif pack:tarballs\"","hidden":true,"multiple":false},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false},"targets":{"name":"targets","type":"option","description":"comma-separated targets to pack (e.g.: darwin-x64,darwin-arm64)","multiple":false}},"args":[]},"pack:tarballs":{"id":"pack:tarballs","description":"packages oclif CLI into tarballs\n\nThis can be used to create oclif CLIs that use the system node or that come preloaded with a node binary.\n","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to pack (e.g.: linux-arm,win32-x64)","multiple":false},"xz":{"name":"xz","type":"boolean","description":"also build xz","allowNo":true},"parallel":{"name":"parallel","type":"boolean","description":"build tarballs in parallel","allowNo":false},"tarball":{"name":"tarball","type":"option","char":"l","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"args":[]},"pack:win":{"id":"pack:win","description":"create windows installer from oclif CLI\n\n  This command requires WINDOWS_SIGNING (prefixed with the name of your executable, e.g. OCLIF_WINDOWS_SIGNING_PASS) to be set in the environment","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"additional-cli":{"name":"additional-cli","type":"option","description":"an Oclif CLI other than the one listed in config.bin that should be made available to the user\nthe CLI should already exist in a directory named after the CLI that is the root of the tarball produced by \"oclif pack:tarballs\"","hidden":true,"multiple":false},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"args":[]},"upload:deb":{"id":"upload:deb","description":"upload deb package built with pack:deb","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]},"upload:macos":{"id":"upload:macos","description":"upload macos installers built with pack:macos","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to upload (e.g.: darwin-x64,darwin-arm64)","multiple":false}},"args":[]},"upload:tarballs":{"id":"upload:tarballs","description":"upload an oclif CLI to S3\n\n\"aws-sdk\" will need to be installed as a devDependency to upload.\n","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to upload (e.g.: linux-arm,win32-x64)","multiple":false},"xz":{"name":"xz","type":"boolean","description":"also upload xz","allowNo":true}},"args":[]},"upload:win":{"id":"upload:win","description":"upload windows installers built with pack:win","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]}}}
+{"version":"3.4.0","commands":{"generate":{"id":"generate","description":"generate a new CLI\nThis will clone the template repo 'oclif/hello-world' and update package properties","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"name","description":"directory name of new project","required":true}]},"manifest":{"id":"manifest","description":"generates plugin manifest json","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"path to plugin","default":"."}]},"promote":{"id":"promote","description":"promote CLI builds to a S3 release channel","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to the oclif CLI project root","required":true,"multiple":false,"default":"."},"version":{"name":"version","type":"option","description":"semantic version of the CLI to promote","required":true,"multiple":false},"sha":{"name":"sha","type":"option","description":"7-digit short git commit SHA of the CLI to promote","required":true,"multiple":false},"channel":{"name":"channel","type":"option","description":"which channel to promote to","required":true,"multiple":false,"default":"stable"},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to promote (e.g.: linux-arm,win32-x64)","multiple":false},"deb":{"name":"deb","type":"boolean","char":"d","description":"promote debian artifacts","allowNo":false},"macos":{"name":"macos","type":"boolean","char":"m","description":"promote macOS pkg","allowNo":false},"win":{"name":"win","type":"boolean","char":"w","description":"promote Windows exe","allowNo":false},"max-age":{"name":"max-age","type":"option","char":"a","description":"cache control max-age in seconds","multiple":false,"default":"86400"},"xz":{"name":"xz","type":"boolean","description":"also upload xz","allowNo":true},"indexes":{"name":"indexes","type":"boolean","description":"append the promoted urls into the index files","allowNo":false}},"args":[]},"readme":{"id":"readme","description":"adds commands to README.md in current directory\nThe readme must have any of the following tags inside of it for it to be replaced or else it will do nothing:\n# Usage\n<!-- usage -->\n# Commands\n<!-- commands -->\n# Table of contents\n<!-- toc -->\n\nCustomize the code URL prefix by setting oclif.repositoryPrefix in package.json.\n","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"output directory for multi docs","required":true,"multiple":false,"default":"docs"},"multi":{"name":"multi","type":"boolean","description":"create a different markdown page for each topic","allowNo":false},"aliases":{"name":"aliases","type":"boolean","description":"include aliases in the command list","allowNo":true}},"args":[]},"generate:command":{"id":"generate:command","description":"add a command to an existing CLI or plugin","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"name","description":"name of command","required":true}]},"generate:hook":{"id":"generate:hook","description":"add a hook to an existing CLI or plugin","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false},"event":{"name":"event","type":"option","description":"event to run hook on","multiple":false,"default":"init"}},"args":[{"name":"name","description":"name of hook (snake_case)","required":true}]},"pack:deb":{"id":"pack:deb","description":"pack CLI into debian package","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"args":[]},"pack:macos":{"id":"pack:macos","description":"pack CLI into macOS .pkg","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"additional-cli":{"name":"additional-cli","type":"option","description":"an Oclif CLI other than the one listed in config.bin that should be made available to the user\nthe CLI should already exist in a directory named after the CLI that is the root of the tarball produced by \"oclif pack:tarballs\"","hidden":true,"multiple":false},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false},"targets":{"name":"targets","type":"option","description":"comma-separated targets to pack (e.g.: darwin-x64,darwin-arm64)","multiple":false}},"args":[]},"pack:tarballs":{"id":"pack:tarballs","description":"packages oclif CLI into tarballs\n\nThis can be used to create oclif CLIs that use the system node or that come preloaded with a node binary.\n","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to pack (e.g.: linux-arm,win32-x64)","multiple":false},"xz":{"name":"xz","type":"boolean","description":"also build xz","allowNo":true},"parallel":{"name":"parallel","type":"boolean","description":"build tarballs in parallel","allowNo":false},"tarball":{"name":"tarball","type":"option","char":"l","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"args":[]},"pack:win":{"id":"pack:win","description":"create windows installer from oclif CLI\n\n  This command requires WINDOWS_SIGNING (prefixed with the name of your executable, e.g. OCLIF_WINDOWS_SIGNING_PASS) to be set in the environment","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"additional-cli":{"name":"additional-cli","type":"option","description":"an Oclif CLI other than the one listed in config.bin that should be made available to the user\nthe CLI should already exist in a directory named after the CLI that is the root of the tarball produced by \"oclif pack:tarballs\"","hidden":true,"multiple":false},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"args":[]},"upload:deb":{"id":"upload:deb","description":"upload deb package built with pack:deb","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]},"upload:macos":{"id":"upload:macos","description":"upload macos installers built with pack:macos","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to upload (e.g.: darwin-x64,darwin-arm64)","multiple":false}},"args":[]},"upload:tarballs":{"id":"upload:tarballs","description":"upload an oclif CLI to S3\n\n\"aws-sdk\" will need to be installed as a devDependency to upload.\n","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to upload (e.g.: linux-arm,win32-x64)","multiple":false},"xz":{"name":"xz","type":"boolean","description":"also upload xz","allowNo":true}},"args":[]},"upload:win":{"id":"upload:win","description":"upload windows installers built with pack:win","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]}}}

package/lib/aws.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs-extra");
-const qq = require("qqjs");
 const log_1 = require("./log");
+const util_1 = require("./util");
 const debug = log_1.debug.new('aws');
 const cache = {};
 const aws = {
@@ -53,7 +53,7 @@ exports.default = {
     get s3() {
         return {
             uploadFile: (local, options) => new Promise((resolve, reject) => {
-                (0, log_1.log)('s3:uploadFile', qq.prettifyPaths(local), `s3://${options.Bucket}/${options.Key}`);
+                (0, log_1.log)('s3:uploadFile', (0, util_1.prettifyPaths)(local), `s3://${options.Bucket}/${options.Key}`);
                 options.Body = fs.createReadStream(local);
                 aws.s3.upload(options, err => {
                     if (err)

package/lib/commands/pack/deb.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
+const fs = require("fs-extra");
 const _ = require("lodash");
-const qq = require("qqjs");
+const path = require("path");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
+const child_process_1 = require("child_process");
+const node_util_1 = require("node:util");
+const exec = (0, node_util_1.promisify)(child_process_1.exec);
 const scripts = {
     /* eslint-disable no-useless-escape */
     bin: (config) => `#!/usr/bin/env bash
@@ -48,44 +52,52 @@ class PackDeb extends core_1.Command {
         const { flags } = await this.parse(PackDeb);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { config } = buildConfig;
-        await Tarballs.build(buildConfig, { platform: 'linux', pack: false, tarball: flags.tarball });
+        await Tarballs.build(buildConfig, { platform: 'linux', pack: false, tarball: flags.tarball, parallel: true });
         const dist = buildConfig.dist('deb');
-        await qq.emptyDir(dist);
+        await fs.emptyDir(dist);
         const build = async (arch) => {
+            this.log(`building debian / ${arch}`);
             const target = { platform: 'linux', arch };
             const versionedDebBase = (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: (0, upload_util_1.debArch)(arch) });
-            const workspace = qq.join(buildConfig.tmp, 'apt', versionedDebBase.replace('.deb', '.apt'));
-            await qq.rm(workspace);
-            await qq.mkdirp([workspace, 'DEBIAN']);
-            await qq.mkdirp([workspace, 'usr/bin']);
-            await qq.mkdirp([workspace, 'usr/lib']);
-            await qq.mv(buildConfig.workspace(target), [workspace, 'usr/lib', config.dirname]);
-            await qq.write([workspace, 'usr/lib', config.dirname, 'bin', config.bin], scripts.bin(config));
-            await qq.write([workspace, 'DEBIAN/control'], scripts.control(buildConfig, (0, upload_util_1.debArch)(arch)));
-            await qq.chmod([workspace, 'usr/lib', config.dirname, 'bin', config.bin], 0o755);
-            await qq.x(`ln -s "../lib/${config.dirname}/bin/${config.bin}" "${workspace}/usr/bin/${config.bin}"`);
-            await qq.x(`sudo chown -R root "${workspace}"`);
-            await qq.x(`sudo chgrp -R root "${workspace}"`);
-            await qq.x(`dpkg --build "${workspace}" "${qq.join(dist, versionedDebBase)}"`);
+            const workspace = path.join(buildConfig.tmp, 'apt', versionedDebBase.replace('.deb', '.apt'));
+            await fs.remove(workspace);
+            await Promise.all([
+                fs.promises.mkdir(path.join(workspace, 'DEBIAN'), { recursive: true }),
+                fs.promises.mkdir(path.join(workspace, 'usr', 'bin'), { recursive: true }),
+            ]);
+            await fs.copy(buildConfig.workspace(target), path.join(workspace, 'usr', 'lib', config.dirname));
+            await Promise.all([
+                // usr/lib/oclif/bin/oclif (the executable)
+                fs.promises.writeFile(path.join(workspace, 'usr', 'lib', config.dirname, 'bin', config.bin), scripts.bin(config), { mode: 0o755 }),
+                fs.promises.writeFile(path.join(workspace, 'DEBIAN', 'control'), scripts.control(buildConfig, (0, upload_util_1.debArch)(arch))),
+            ]);
+            // symlink usr/bin/oclif points to usr/lib/oclif/bin/oclif
+            await exec(`ln -s "${path.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${config.bin}"`, { cwd: path.join(workspace, 'usr', 'bin') });
+            await exec(`sudo chown -R root "${workspace}"`);
+            await exec(`sudo chgrp -R root "${workspace}"`);
+            await exec(`dpkg --build "${workspace}" "${path.join(dist, versionedDebBase)}"`);
+            this.log(`finished building debian / ${arch}`);
         };
         const arches = _.uniq(buildConfig.targets
             .filter(t => t.platform === 'linux')
             .map(t => t.arch));
-        // eslint-disable-next-line no-await-in-loop
-        for (const a of arches)
-            await build(a);
-        await qq.x('apt-ftparchive packages . > Packages', { cwd: dist });
-        await qq.x('gzip -c Packages > Packages.gz', { cwd: dist });
-        await qq.x('bzip2 -k Packages', { cwd: dist });
-        await qq.x('xz -k Packages', { cwd: dist });
-        const ftparchive = qq.join(buildConfig.tmp, 'apt', 'apt-ftparchive.conf');
-        await qq.write(ftparchive, scripts.ftparchive(config));
-        await qq.x(`apt-ftparchive -c "${ftparchive}" release . > Release`, { cwd: dist });
+        await Promise.all(arches.map(a => build(a)));
+        await exec('apt-ftparchive packages . > Packages', { cwd: dist });
+        this.log('debian packages created');
+        await Promise.all([
+            exec('gzip -c Packages > Packages.gz', { cwd: dist }),
+            exec('bzip2 -k Packages', { cwd: dist }),
+            exec('xz -k Packages', { cwd: dist }),
+            packForFTP(buildConfig, config, dist),
+        ]);
+        this.log('debian packages archived');
         const gpgKey = config.scopedEnvVar('DEB_KEY');
         if (gpgKey) {
-            await qq.x(`gpg --digest-algo SHA512 --clearsign -u ${gpgKey} -o InRelease Release`, { cwd: dist });
-            await qq.x(`gpg --digest-algo SHA512 -abs -u ${gpgKey} -o Release.gpg Release`, { cwd: dist });
+            this.log('adding gpg signatures to Release');
+            await exec(`gpg --digest-algo SHA512 --clearsign -u ${gpgKey} -o InRelease Release`, { cwd: dist });
+            await exec(`gpg --digest-algo SHA512 -abs -u ${gpgKey} -o Release.gpg Release`, { cwd: dist });
         }
+        this.log('debian packing complete');
     }
 }
 exports.default = PackDeb;
@@ -94,3 +106,9 @@ PackDeb.flags = {
     root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
     tarball: core_1.Flags.string({ char: 't', description: 'optionally specify a path to a tarball already generated by NPM', required: false }),
 };
+async function packForFTP(buildConfig, config, dist) {
+    const ftparchive = path.join(buildConfig.tmp, 'apt', 'apt-ftparchive.conf');
+    await fs.promises.mkdir(path.basename(ftparchive), { recursive: true });
+    await fs.writeFile(ftparchive, scripts.ftparchive(config));
+    await exec(`apt-ftparchive -c "${ftparchive}" release . > Release`, { cwd: dist });
+}

package/lib/commands/pack/macos.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
 const _ = require("lodash");
-const qq = require("qqjs");
+const fs = require("fs-extra");
 const core_1 = require("@oclif/core");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
+const child_process_1 = require("child_process");
+const node_util_1 = require("node:util");
+const exec = (0, node_util_1.promisify)(child_process_1.exec);
 const noBundleConfiguration = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -65,7 +69,7 @@ while [ "$1" != "-y" ]; do
 done
 
 echo "Application uninstalling process started"
-# remove link to shorcut file
+# remove link to shortcut file
 find "/usr/local/bin/" -name "${config.bin}" | xargs rm
 ${additionalCLI ? `find "/usr/local/bin/" -name "${additionalCLI}" | xargs rm` : ''}
 if [ $? -eq 0 ]
@@ -123,28 +127,30 @@ class PackMacos extends core_1.Command {
             this.error('package.json must have oclif.macos.identifier set');
         const macos = c.macos;
         const packageIdentifier = macos.identifier;
-        await Tarballs.build(buildConfig, { platform: 'darwin', pack: false, tarball: flags.tarball });
-        const scriptsDir = qq.join(buildConfig.tmp, 'macos/scripts');
-        await qq.emptyDir(buildConfig.dist('macos'));
-        const noBundleConfigurationPath = qq.join(buildConfig.tmp, 'macos/no-bundle.plist');
+        await Tarballs.build(buildConfig, { platform: 'darwin', pack: false, tarball: flags.tarball, parallel: true });
+        const scriptsDir = path.join(buildConfig.tmp, 'macos/scripts');
+        await fs.emptyDir(buildConfig.dist('macos'));
+        const noBundleConfigurationPath = path.join(buildConfig.tmp, 'macos', 'no-bundle.plist');
         const build = async (arch) => {
             const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const dist = buildConfig.dist(`macos/${templateKey}`);
             const rootDir = buildConfig.workspace({ platform: 'darwin', arch });
             const writeNoBundleConfiguration = async () => {
-                await qq.write(noBundleConfigurationPath, noBundleConfiguration);
-                await qq.chmod(noBundleConfigurationPath, 0o755);
+                await fs.mkdir(path.dirname(noBundleConfigurationPath), { recursive: true });
+                await fs.writeFile(noBundleConfigurationPath, noBundleConfiguration, { mode: 0o755 });
             };
             const writeScript = async (script) => {
-                const path = script === 'uninstall' ? [rootDir, 'bin'] : [scriptsDir];
-                path.push(script);
-                await qq.write(path, scripts[script](config, flags['additional-cli']));
-                await qq.chmod(path, 0o755);
+                const scriptLocation = script === 'uninstall' ? [rootDir, 'bin'] : [scriptsDir];
+                scriptLocation.push(script);
+                await fs.mkdir(path.dirname(path.join(...scriptLocation)), { recursive: true });
+                await fs.writeFile(path.join(...scriptLocation), scripts[script](config, flags['additional-cli']), { mode: 0o755 });
             };
-            await writeNoBundleConfiguration();
-            await writeScript('preinstall');
-            await writeScript('postinstall');
-            await writeScript('uninstall');
+            await Promise.all([
+                writeNoBundleConfiguration(),
+                writeScript('preinstall'),
+                writeScript('postinstall'),
+                writeScript('uninstall'),
+            ]);
             /* eslint-disable array-element-newline */
             const args = [
                 '--root', rootDir,
@@ -163,14 +169,12 @@ class PackMacos extends core_1.Command {
             if (process.env.OSX_KEYCHAIN)
                 args.push('--keychain', process.env.OSX_KEYCHAIN);
             args.push(dist);
-            await qq.x('pkgbuild', args);
+            await exec(`pkgbuild  ${args.join(' ')}`);
         };
         const arches = _.uniq(buildConfig.targets
             .filter(t => t.platform === 'darwin')
             .map(t => t.arch));
-        // eslint-disable-next-line no-await-in-loop
-        for (const a of arches)
-            await build(a);
+        await Promise.all(arches.map(a => build(a)));
     }
 }
 exports.default = PackMacos;

package/lib/commands/pack/tarballs.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const qq = require("qqjs");
 const Tarballs = require("../../tarballs");
 class PackTarballs extends core_1.Command {
     async run() {
         var _a;
-        const prevCwd = qq.cwd();
         if (process.platform === 'win32')
             throw new Error('pack does not function on windows');
         const { flags } = await this.parse(PackTarballs);
@@ -18,7 +16,6 @@ class PackTarballs extends core_1.Command {
             tarball: flags.tarball,
             parallel: flags.parallel,
         });
-        qq.cd(prevCwd);
     }
 }
 exports.default = PackTarballs;

package/lib/commands/pack/win.js

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const qq = require("qqjs");
+const path = require("path");
+const fs = require("fs-extra");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
+const child_process_1 = require("child_process");
+const node_util_1 = require("node:util");
+const exec = (0, node_util_1.promisify)(child_process_1.exec);
 const scripts = {
     /* eslint-disable no-useless-escape */
     // eslint-disable-next-line unicorn/no-useless-undefined
@@ -199,58 +203,37 @@ class PackWin extends core_1.Command {
         const { flags } = await this.parse(PackWin);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { config } = buildConfig;
-        await Tarballs.build(buildConfig, { platform: 'win32', pack: false, tarball: flags.tarball });
+        await Tarballs.build(buildConfig, { platform: 'win32', pack: false, tarball: flags.tarball, parallel: true });
         const arches = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
-        for (const arch of arches) {
-            const installerBase = qq.join(buildConfig.tmp, `windows-${arch}-installer`);
-            // eslint-disable-next-line no-await-in-loop
-            await qq.write([installerBase, `bin/${config.bin}.cmd`], scripts.cmd(config));
-            // eslint-disable-next-line no-await-in-loop
-            await qq.write([installerBase, `bin/${config.bin}`], scripts.sh(config));
-            if (flags['additional-cli']) {
-                await qq.write([installerBase, `bin/${flags['additional-cli']}.cmd`], scripts.cmd(config, flags['additional-cli'])); // eslint-disable-line no-await-in-loop
-                await qq.write([installerBase, `bin/${flags['additional-cli']}`], scripts.sh({ bin: flags['additional-cli'] })); // eslint-disable-line no-await-in-loop
-            }
-            // eslint-disable-next-line no-await-in-loop
-            await qq.write([installerBase, `${config.bin}.nsi`], scripts.nsis(config, arch));
-            // eslint-disable-next-line no-await-in-loop
-            await qq.mv(buildConfig.workspace({ platform: 'win32', arch }), [installerBase, 'client']);
-            // eslint-disable-next-line no-await-in-loop
-            await qq.x(`makensis ${installerBase}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
+        await Promise.all(arches.map(async (arch) => {
+            const installerBase = path.join(buildConfig.tmp, `windows-${arch}-installer`);
+            await fs.promises.rm(installerBase, { recursive: true, force: true });
+            await fs.promises.mkdir(path.join(installerBase, 'bin'), { recursive: true });
+            await Promise.all([
+                fs.writeFile(path.join(installerBase, 'bin', `${config.bin}.cmd`), scripts.cmd(config)),
+                fs.writeFile(path.join(installerBase, 'bin', `${config.bin}`), scripts.sh(config)),
+                fs.writeFile(path.join(installerBase, `${config.bin}.nsi`), scripts.nsis(config, arch)),
+            ].concat(flags['additional-cli'] ? [
+                fs.writeFile(path.join(installerBase, 'bin', `${flags['additional-cli']}.cmd`), scripts.cmd(config, flags['additional-cli'])),
+                fs.writeFile(path.join(installerBase, 'bin', `${flags['additional-cli']}`), scripts.sh({ bin: flags['additional-cli'] })),
+            ] : []));
+            await fs.move(buildConfig.workspace({ platform: 'win32', arch }), path.join(installerBase, 'client'));
+            await exec(`makensis ${installerBase}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
             const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const o = buildConfig.dist(`win32/${templateKey}`);
-            // eslint-disable-next-line no-await-in-loop
-            await qq.mv([installerBase, 'installer.exe'], o);
+            await fs.move(path.join(installerBase, 'installer.exe'), o);
             const windows = config.pjson.oclif.windows;
             if (windows && windows.name && windows.keypath) {
-                const buildLocationUnsigned = o.replace(`${arch}.exe`, `${arch}-unsigned.exe`);
-                // eslint-disable-next-line no-await-in-loop
-                await qq.mv(o, buildLocationUnsigned);
-                const pass = config.scopedEnvVar('WINDOWS_SIGNING_PASS');
-                if (!pass) {
-                    throw new Error(`${config.scopedEnvVarKey('WINDOWS_SIGNING_PASS')} not set in the environment`);
-                }
-                /* eslint-disable array-element-newline */
-                const args = [
-                    '-pkcs12', windows.keypath,
-                    '-pass', pass,
-                    '-n', windows.name,
-                    '-i', windows.homepage || config.pjson.homepage,
-                    '-h', 'sha512',
-                    '-in', buildLocationUnsigned,
-                    '-out', o,
-                ];
-                // eslint-disable-next-line no-await-in-loop
-                await qq.x('osslsigncode', args);
+                await signWindows(o, arch, config, windows);
             }
             else
                 this.debug('Skipping windows exe signing');
             this.log(`built ${o}`);
-        }
+        }));
     }
     async checkForNSIS() {
         try {
-            await qq.x('makensis', { stdio: [0, null, 2] });
+            await exec('makensis');
         }
         catch (error) {
             if (error.code === 1)
@@ -284,3 +267,22 @@ the CLI should already exist in a directory named after the CLI that is the root
         required: false,
     }),
 };
+async function signWindows(o, arch, config, windows) {
+    const buildLocationUnsigned = o.replace(`${arch}.exe`, `${arch}-unsigned.exe`);
+    await fs.move(o, buildLocationUnsigned);
+    const pass = config.scopedEnvVar('WINDOWS_SIGNING_PASS');
+    if (!pass) {
+        throw new Error(`${config.scopedEnvVarKey('WINDOWS_SIGNING_PASS')} not set in the environment`);
+    }
+    /* eslint-disable array-element-newline */
+    const args = [
+        '-pkcs12', windows.keypath,
+        '-pass', pass,
+        '-n', `"${windows.name}"`,
+        '-i', windows.homepage || config.pjson.homepage,
+        '-h', 'sha512',
+        '-in', buildLocationUnsigned,
+        '-out', o,
+    ];
+    await exec(`osslsigncode sign ${args}.join(' ')`);
+}