npm-pkgbuild 10.17.1 → 10.17.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2022 by arlac77
+Copyright (c) 2018-2023 by arlac77
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

package/package.json

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

package/src/extract-from-package.mjs

@@ -238,7 +238,7 @@ export async function* extractFromPackage(options = {}) {
 
     for (const a of arch) {
       if (!restrictArch.size || restrictArch.has(a)) {
-         if (!options.available || npmArchMapping[process.arch] === a) {
+         if (!options.prepare || npmArchMapping[process.arch] === a) {
           numberOfArchs++;
           properties.arch = [a];
           yield {

package/src/npm-pkgbuild-cli.mjs

@@ -72,7 +72,7 @@ program
         for (const outputFactory of allOutputs.filter(
           o => options[o.name] === true || output[o.name] !== undefined
         )) {
-          if (options.available && !(await outputFactory.available)) {
+          if (options.available && !(await outputFactory.prepare)) {
             continute;
           }
 

package/src/output/arch.mjs

@@ -54,7 +54,8 @@ function keyPrefix(key) {
 
 const PKGBUILD = "PKGBUILD";
 
-let ext = ".pkg.tar.xz";
+let _ext = ".pkg.tar.xz";
+let _prepared;
 
 export class ARCH extends Packager {
   static get name() {
@@ -66,14 +67,15 @@ export class ARCH extends Packager {
   }
 
   static get fileNameExtension() {
-    return ext;
+    return _ext;
   }
 
   static get fields() {
     return fields;
   }
 
-  static async available() {
+  static async prepare() {
+    if(_prepared === undefined) {
     try {
       await execa("makepkg", ["-V"]);
 
@@ -84,12 +86,14 @@ export class ARCH extends Packager {
           .substring(i)
           .split(/\n/)[0]
           .match(/='([^']+)'/);
-        ext = m[1];
+        _ext = m[1];
       }
-      return true;
-    } catch {}
-
-    return false;
+      _prepared = true;
+    } catch {
+      _prepared = false;
+    }
+  }
+    return _prepared;
   }
 
   get packageFileName() {

package/src/output/debian.mjs

@@ -47,7 +47,7 @@ export class DEBIAN extends Packager {
     return fields;
   }
 
-  static async available() {
+  static async prepare() {
     try {
       await execa("dpkg", ["--version"]);
       return true;

package/src/output/oci.mjs

@@ -64,7 +64,7 @@ export class OCI extends Packager {
     return ".oci.tar.gz";
   }
 
-  static available() {
+  static prepare() {
     return true;
   }
 

package/src/output/packager.mjs

@@ -28,7 +28,7 @@ export class Packager {
     };
   }
 
-  static available() {
+  static prepare() {
     return false;
   }
 

package/src/output/rpm.mjs

@@ -80,7 +80,7 @@ export class RPM extends Packager {
    * Check for rpmbuild presence.
    * @returns {boolean} true when rpmbuild is present
    */
-  static async available() {
+  static async prepare() {
     try {
       await execa("rpmbuild", ["--version"]);
       return true;