npm-pkgbuild 11.1.17 → 11.2.1

package/package.json

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

package/src/npm-pkgbuild-cli.mjs

@@ -36,7 +36,11 @@ program
     Object.assign(former, Object.fromEntries([str.split(/=/)]))
   )
   .option("-p --dir <dir>", "which package to use", process.cwd())
-  .option("-a --available", "only execute availabe output/arch combintions", false)
+  .option(
+    "-a --available",
+    "only execute availabe output/arch combintions",
+    false
+  )
   .option("--continue", "continue on error")
   .option(
     "-c --content <dir>",
@@ -72,7 +76,10 @@ program
         for (const outputFactory of allOutputs.filter(
           o => options[o.name] === true || output[o.name] !== undefined
         )) {
-          if (options.available && !(await outputFactory.prepare(options))) {
+          if (
+            options.available &&
+            !(await outputFactory.prepare(options, variant))
+          ) {
             continute;
           }
 
@@ -127,11 +134,11 @@ program
 
             if (options.verbose) {
               console.log("variant:");
-              console.log(kv(variant,"  "));
+              console.log(kv(variant, "  "));
               console.log("sources:");
               console.log("  " + sources.join("\n  "));
               console.log("dependencies:");
-              console.log(kv(dependencies,"  "));
+              console.log(kv(dependencies, "  "));
               console.log(kv(output.properties));
             }
 
@@ -166,8 +173,10 @@ function handleError(e, options) {
   }
 }
 
-function kv(object, prefix="") {
-  return object ? Object.entries(object)
-    .map(([k, v]) => `${prefix}${k}: ${v}`)
-    .join("\n"): "";
+function kv(object, prefix = "") {
+  return object
+    ? Object.entries(object)
+        .map(([k, v]) => `${prefix}${k}: ${v}`)
+        .join("\n")
+    : "";
 }

package/src/output/arch.mjs

@@ -56,6 +56,7 @@ const PKGBUILD = "PKGBUILD";
 
 let _ext = ".pkg.tar.xz";
 let _prepared;
+let _architecture = "aarch64";
 
 export class ARCH extends Packager {
   static get name() {
@@ -74,7 +75,7 @@ export class ARCH extends Packager {
     return fields;
   }
 
-  static async prepare(options) {
+  static async prepare(options, variant) {
     if (_prepared === undefined) {
       try {
         await execa("makepkg", ["-V"]);
@@ -83,20 +84,25 @@ export class ARCH extends Packager {
         if (options.verbose) {
           console.log(cfg);
         }
-        const i = cfg.indexOf("PKGEXT='");
-        if (i > 0) {
-          const m = cfg
-            .substring(i)
-            .split(/\n/)[0]
-            .match(/='([^']+)'/);
-          _ext = m[1];
+
+        function getValue(key) {
+          const i = cfg.indexOf(`${key}='`);
+          if (i > 0) {
+            const m = cfg
+              .substring(i)
+              .split(/\n/)[0]
+              .match(/='([^'"]+)['"]/);
+            return m[1];
+          }
         }
+        _ext = getValue("PKGEXT");
+        _architecture = getValue("CARCH");
         _prepared = true;
       } catch {
         _prepared = false;
       }
     }
-    return _prepared;
+    return _prepared && !variant || variant.arch === _architecture;
   }
 
   get packageFileName() {
@@ -172,9 +178,7 @@ package() {
     }
 
     if (options.verbose) {
-      console.log(
-        await readFile(join(staging, PKGBUILD), utf8StreamOptions)
-      );
+      console.log(await readFile(join(staging, PKGBUILD), utf8StreamOptions));
     }
 
     if (!options.dry) {

package/src/output/rpm.mjs

@@ -80,9 +80,13 @@ export class RPM extends Packager {
    * Check for rpmbuild presence.
    * @returns {boolean} true when rpmbuild is present
    */
-  static async prepare() {
+  static async prepare(options, variant) {
     try {
       await execa("rpmbuild", ["--version"]);
+      if (variant?.arch) {
+        const uname = await execa("uname", ["-m"]);
+        return uname.stdout.match(variant.arch);
+      }
       return true;
     } catch {}
 
@@ -184,10 +188,13 @@ export class RPM extends Packager {
       }
 
       await cp(
-        join(tmpdir, "RPMS",
+        join(
+          tmpdir,
+          "RPMS",
           // TODO handle arrays ?
           Array.isArray(properties.arch) ? properties.arch[0] : properties.arch,
-          this.packageFileName),
+          this.packageFileName
+        ),
         packageFile,
         { preserveTimestamps: true }
       );