npm-pkgbuild 7.3.3 → 7.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.3.3",
+  "version": "7.3.4",
   "publishConfig": {
     "access": "public"
   },

package/src/npm-pkgbuild-cli.mjs

@@ -26,7 +26,7 @@ outputs.forEach(o =>
 
 program
   .option("--pkgver <version>", "package version")
-  .option("-p --package <dir>", "where to put the package(s)", cwd)
+  .option("-d --destination <dir>", "where to put the package(s)", cwd)
   .option("-s --staging <dir>", "staging directory", "build")
   .option(
     "-c --content <dir>",
@@ -70,7 +70,7 @@ program
           properties
         );
 
-        const fileName = await output.execute();
+        const fileName = await output.execute(options);
 
         console.log(fileName);
       }

package/src/output/deb.mjs

@@ -3,7 +3,7 @@ import { tmpdir } from "os";
 import { createWriteStream } from "fs";
 import { mkdtemp, mkdir, chmod } from "fs/promises";
 import { pipeline } from "stream/promises";
-import { execa } from "execa";
+import { execa } from "execa";
 import { EmptyContentEntry } from "content-entry";
 import { Packager } from "./packager.mjs";
 import { keyValueTransformer } from "../key-value-transformer.mjs";
@@ -26,7 +26,11 @@ export class Deb extends Packager {
     return ".deb";
   }
 
-  async execute() {
+  get packageFileName() {
+    return `${this.properties.name}_${this.properties.version}_${this.properties.arch}${this.constructor.fileNameExtension}`;
+  }
+
+  async execute(options) {
     const properties = this.properties;
 
     Object.entries(fields).forEach(([k, v]) => {
@@ -34,6 +38,11 @@ export class Deb extends Packager {
       if (e !== undefined) {
         properties[k] = e;
       }
+      else {
+        if(v.default !== undefined) {
+          properties[v.alias] = v.default;
+        }
+      }
     });
 
     const tmp = await mkdtemp(join(tmpdir(), "deb-"));
@@ -58,8 +67,6 @@ export class Deb extends Packager {
       }
     }
 
-    const output = `${staging}${this.constructor.fileNameExtension}`;
-
     let debianControlEntry;
 
     for await (const entry of this.source) {
@@ -71,10 +78,7 @@ export class Deb extends Packager {
         debianControlEntry = entry;
       } else {
         console.log("ENTRY", entry.name, entry.basename);
-        await pipeline(
-          await entry.readStream,
-          createWriteStream(destName)
-        );
+        await pipeline(await entry.readStream, createWriteStream(destName));
 
         await Promise.all(
           Object.entries(permissions).map(async ([pattern, option]) => {
@@ -103,9 +107,9 @@ export class Deb extends Packager {
       createWriteStream(destName)
     );
 
-    await execa("dpkg", ["-b", staging]);
+    await execa("dpkg", ["-b", staging, options.destination]);
 
-    return output;
+    return join(options.destination, this.packageFileName);
   }
 }
 
@@ -123,7 +127,7 @@ const fields = {
   Priority: { type: "string", recommended: true },
   Essential: { type: "boolean" },
   Origin: { type: "string" },
-  Architecture: { type: "string", default: "any", mandatory: true },
+  Architecture: { alias: "arch", type: "string", default: "any", mandatory: true },
   Homepage: { alias: "homepage", type: "string" },
   Bugs: { alias: "bugs", type: "string" },
   Depends: { alias: "depends", type: "packageList" },