npm-pkgbuild 7.2.4 → 7.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.2.4",
+  "version": "7.2.8",
   "publishConfig": {
     "access": "public"
   },
@@ -39,9 +39,9 @@
   },
   "dependencies": {
     "aggregate-async-iterator": "^1.1.7",
-    "commander": "^8.2.0",
-    "content-entry": "^2.7.0",
-    "content-entry-filesystem": "^3.0.0",
+    "commander": "^8.3.0",
+    "content-entry": "^2.7.1",
+    "content-entry-filesystem": "^3.0.1",
     "execa": "^5.1.1",
     "expression-expander": "^7.0.9",
     "globby": "^12.0.2",

package/src/key-value-transformer.mjs

@@ -4,17 +4,38 @@
  * @param updates
  */
 export async function* keyValueTransformer(source, updates) {
-  for await (let line of asLines(source)) {
-    const m = line.match(/^(\w+):\s*(.*)/);
-    if (m) {
-      const [k, v] = updates(m[1], m[2]);
+  let key, value;
+
+  function* eject() {
+    if (key !== undefined) {
+      const [k, v] = updates(key, value);
       if (k !== undefined) {
         yield `${k}: ${v}\n`;
       }
+      key = value = undefined;
+    }
+  }
+
+  for await (const line of asLines(source)) {
+    const m = line.match(/^(\w+):\s*(.*)/);
+    if (m) {
+      yield* eject();
+      key = m[1];
+      value = m[2];
+    } else if (key !== undefined) {
+      const m = line.match(/^\s+(.*)/);
+      if (m) {
+        value += m[1];
+      } else {
+        yield* eject();
+        yield line + "\n";
+      }
     } else {
       yield line + "\n";
     }
   }
+
+  yield* eject();
 }
 
 async function* asLines(source) {

package/src/npm-pkgbuild-cli.mjs

@@ -53,12 +53,15 @@ program
         );
 
         const properties = Object.fromEntries(
-          ["name", "version", "description", "homepage"].map(key => [
-            key,
-            pkg[key]
-          ]).filter(([k,v]) => v !== undefined )
+          ["name", "version", "description", "homepage"]
+            .map(key => [key, pkg[key]])
+            .filter(([k, v]) => v !== undefined)
         );
 
+        if(pkg.contributors) {
+          properties.maintainer = pkg.contributors.map(c => `${c.name} <${c.email}>`)[0];
+        }
+
         const sources = [...options.content, ...options.meta]
           .filter(x => x)
           .map(source =>

package/src/output/deb.mjs

@@ -4,12 +4,15 @@ import { createWriteStream } from "fs";
 import { mkdtemp, mkdir, chmod } from "fs/promises";
 import { pipeline } from "stream/promises";
 import execa from "execa";
+import { EmptyContentEntry } from "content-entry";
 import { Packager } from "./packager.mjs";
 import { keyValueTransformer } from "../key-value-transformer.mjs";
 
 const permissions = {
   "DEBIAN/preinst": { chmod: "0775" },
-  "DEBIAN/postinst": { chmod: "0775" }
+  "DEBIAN/postinst": { chmod: "0775" },
+  "DEBIAN/prerm": { chmod: "0775" },
+  "DEBIAN/postrm": { chmod: "0775" }
 };
 
 export class Deb extends Packager {
@@ -50,16 +53,15 @@ export class Deb extends Packager {
 
     const output = `${staging}${this.constructor.fileNameExtension}`;
 
+    let debianControlEntry;
+
     for await (const entry of this.source) {
       const destName = join(staging, entry.name);
 
       await mkdir(dirname(destName), { recursive: true });
 
       if (entry.name === "DEBIAN/control") {
-        await pipeline(
-          keyValueTransformer(await entry.getReadStream(), controlProperties),
-          createWriteStream(destName)
-        );
+        debianControlEntry = entry;
       } else {
         await pipeline(
           await entry.getReadStream(),
@@ -77,7 +79,22 @@ export class Deb extends Packager {
       }
     }
 
-    //console.log(presentProperties, mandatoryProperties);
+    if (!debianControlEntry) {
+      debianControlEntry = new EmptyContentEntry("DEBIAN/control");
+    }
+
+    let destName = join(staging, debianControlEntry.name);
+
+    console.log("A", destName, dirname(destName));
+    await mkdir(dirname(destName), { recursive: true });
+
+    const x = await pipeline(
+      keyValueTransformer(
+        await debianControlEntry.getReadStream(),
+        controlProperties
+      ),
+      createWriteStream(destName)
+    );
 
     await execa("dpkg", ["-b", staging]);
 
@@ -96,7 +113,7 @@ const fields = {
   Description: { alias: "description", mandatory: true },
   Homepage: { alias: "homepage" },
   Source: { mandatory: true },
-  Maintainer: { mandatory: true },
+  Maintainer: { alias: "maintainer", mandatory: true },
   Uploaders: { mandatory: false },
   Section: { recommended: true },
   Priority: { recommended: true },