npm-pkgbuild 10.16.2 → 10.17.1

package/package.json

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

package/src/extract-from-package.mjs

@@ -246,7 +246,7 @@ export async function* extractFromPackage(options = {}) {
             sources,
             dependencies,
             output,
-            variant,
+            variant: { name: variant, arch, type: Object.keys(output) },
             context
           };
         }
@@ -266,7 +266,7 @@ export async function* extractFromPackage(options = {}) {
       sources,
       dependencies,
       output,
-      variant,
+      variant: { name: variant, type: Object.keys(output) },
       context
     };
   }

package/src/npm-pkgbuild-cli.mjs

@@ -126,9 +126,12 @@ program
             ];
 
             if (options.verbose) {
-              console.log("variant     :", variant);
-              console.log(`sources     : ${sources.join("\n  ")}`);
-              console.log(`dependencies: ${kv(dependencies)}`);
+              console.log("variant:");
+              console.log(kv(variant,"  "));
+              console.log("sources:");
+              console.log("  " + sources.join("\n  "));
+              console.log("dependencies:");
+              console.log(kv(dependencies,"  "));
               console.log(kv(output.properties));
             }
 
@@ -163,8 +166,8 @@ function handleError(e, options) {
   }
 }
 
-function kv(object) {
+function kv(object, prefix="") {
   return object ? Object.entries(object)
-    .map(([k, v]) => `${k}: ${v}`)
+    .map(([k, v]) => `${prefix}${k}: ${v}`)
     .join("\n"): "";
 }

package/src/output/arch.mjs

@@ -54,6 +54,8 @@ function keyPrefix(key) {
 
 const PKGBUILD = "PKGBUILD";
 
+let ext = ".pkg.tar.xz";
+
 export class ARCH extends Packager {
   static get name() {
     return "arch";
@@ -64,7 +66,7 @@ export class ARCH extends Packager {
   }
 
   static get fileNameExtension() {
-    return ".pkg.tar.zst";
+    return ext;
   }
 
   static get fields() {
@@ -74,6 +76,16 @@ export class ARCH extends Packager {
   static async available() {
     try {
       await execa("makepkg", ["-V"]);
+
+      const cfg = await readFile("/etc/makepkg.conf", { encoding: "utf8" });
+      const i = cfg.indexOf("PKGEXT='");
+      if (i > 0) {
+        const m = cfg
+          .substring(i)
+          .split(/\n/)[0]
+          .match(/='([^']+)'/);
+        ext = m[1];
+      }
       return true;
     } catch {}