npm-pkgbuild 10.15.25 → 10.16.1

package/package.json

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

package/src/extract-from-package.mjs

@@ -45,7 +45,7 @@ export const npmArchMapping = {
 };
 
 /**
- * Deliver basic properties from the root package
+ * Deliver basic properties from the root package.
  * @param {Object} content of root package.json
  * @returns {Object} key value pairs extracted from package
  */

package/src/npm-pkgbuild-cli.mjs

@@ -31,6 +31,7 @@ allInputs.forEach(i => program.option(`--${i.name}`, i.description));
 
 program
   .option("--verbose", "be more verbose", false)
+  .option("--dry", "do not execut only print definitions", false)
   .option("-D --define <a=b>", "define property", (str, former = {}) =>
     Object.assign(former, Object.fromEntries([str.split(/=/)]))
   )
@@ -58,6 +59,7 @@ program
         properties,
         sources,
         output,
+        variant,
         dependencies,
         context
       } of extractFromPackage(options)) {
@@ -124,9 +126,10 @@ program
             ];
 
             if (options.verbose) {
-              console.log(output.properties);
-              console.log(`sources: ${sources.join("\n  ")}`);
+              console.log("variant     :",variant);
+              console.log(`sources     : ${sources.join("\n  ")}`);
               console.log(`dependencies: ${JSON.stringify(dependencies)}`);
+              console.log(output.properties);
             }
 
             const fileName = await output.execute(
@@ -137,8 +140,10 @@ program
               context.expand
             );
 
-            for (const p of options.publish) {
-              await publish(fileName, p, output.properties);
+            if (!options.dry) {
+              for (const p of options.publish) {
+                await publish(fileName, p, output.properties);
+              }
             }
           } catch (e) {
             handleError(e, options);

package/src/output/arch.mjs

@@ -112,10 +112,10 @@ package() {
 `;
     }
 
-    if(properties.backup && properties.backup[0] === '/') {
-    	properties.backup = properties.backup.replace(/\//,'');
+    if (properties.backup && properties.backup[0] === "/") {
+      properties.backup = properties.backup.replace(/\//, "");
     }
-    
+
     if (properties.hooks) {
       await pipeline(
         iterableStringInterceptor(
@@ -161,13 +161,15 @@ package() {
       );
     }
 
-    const makepkg = await execa("makepkg", ["-f", "-e"], {
-      cwd: staging,
-      env: { PKGDEST: destination }
-    });
+    if (!options.dry) {
+      const makepkg = await execa("makepkg", ["-f", "-e"], {
+        cwd: staging,
+        env: { PKGDEST: destination }
+      });
 
-    if (options.verbose) {
-      console.log(makepkg.stdout);
+      if (options.verbose) {
+        console.log(makepkg.stdout);
+      }
     }
 
     return join(destination, this.packageFileName);
@@ -212,7 +214,6 @@ const fields = {
   options: { type: "string[]" }
 };
 
-
 function normalizeExpression(e) {
   e = e.replace(/\-([\w\d]+)$/, "");
   if (e.match(/^\d+/)) {
@@ -225,6 +226,8 @@ function normalizeExpression(e) {
 function makeDepends(dependencies) {
   return Object.entries(dependencies).map(
     ([name, version]) =>
-      `${packageNameMapping[name] ? packageNameMapping[name] : name}${normalizeExpression(version)}`
+      `${
+        packageNameMapping[name] ? packageNameMapping[name] : name
+      }${normalizeExpression(version)}`
   );
 }

package/src/output/debian.mjs

@@ -133,10 +133,12 @@ export class DEBIAN extends Packager {
       );
     }
 
-    const dpkg = await execa("dpkg", ["-b", staging, destination]);
+    if (!options.dry) {
+      const dpkg = await execa("dpkg", ["-b", staging, destination]);
 
-    if (options.verbose) {
-      console.log(dpkg.stdout);
+      if (options.verbose) {
+        console.log(dpkg.stdout);
+      }
     }
 
     return join(destination, this.packageFileName);

package/src/output/rpm.mjs

@@ -36,9 +36,12 @@ export function requiresFromDependencies(dependencies) {
   return Object.entries(dependencies).map(
     ([name, e]) =>
       `${packageNameMapping[name] ? packageNameMapping[name] : name}${e
-        .replace(/^\s*(\w+)/,  (match, p1) => ` = ${p1}`)
-        .replace(/^\s*$/,  "")
-        .replace(/^\s*(<|<=|>|>=|=)\s*(\w+)/, (match, p1, p2) => ` ${p1} ${p2}`)}`
+        .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
+        .replace(/^\s*$/, "")
+        .replace(
+          /^\s*(<|<=|>|>=|=)\s*(\w+)/,
+          (match, p1, p2) => ` ${p1} ${p2}`
+        )}`
   );
 }
 
@@ -163,27 +166,29 @@ export class RPM extends Packager {
       );
     }
 
-    const rpmbuild = await execa("rpmbuild", [
-      "--define",
-      `_topdir ${tmpdir}`,
-      "--buildroot",
-      staging,
-      "-vv",
-      "-bb",
-      join(staging, specFileName)
-    ]);
+    const packageFile = join(destination, this.packageFileName);
 
-    if (options.verbose) {
-      console.log(rpmbuild.stdout);
-    }
+    if (!options.dry) {
+      const rpmbuild = await execa("rpmbuild", [
+        "--define",
+        `_topdir ${tmpdir}`,
+        "--buildroot",
+        staging,
+        "-vv",
+        "-bb",
+        join(staging, specFileName)
+      ]);
 
-    const packageFile = join(destination, this.packageFileName);
+      if (options.verbose) {
+        console.log(rpmbuild.stdout);
+      }
 
-    await cp(
-      join(tmpdir, "RPMS", properties.arch, this.packageFileName),
-      packageFile,
-      { preserveTimestamps: true }
-    );
+      await cp(
+        join(tmpdir, "RPMS", properties.arch, this.packageFileName),
+        packageFile,
+        { preserveTimestamps: true }
+      );
+    }
     return packageFile;
   }
 }