npm-pkgbuild 7.4.0 → 7.4.1

package/package.json

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

package/src/output/deb.mjs

@@ -21,7 +21,8 @@ export class DEB extends Packager {
   }
 
   get packageFileName() {
-    return `${this.properties.name}_${this.properties.version}_${this.properties.arch}${this.constructor.fileNameExtension}`;
+    const p = this.properties;
+    return `${p.name}_${p.version}_${p.arch}${this.constructor.fileNameExtension}`;
   }
 
   async execute(sources, options) {

package/src/output/pkg.mjs

@@ -42,6 +42,11 @@ export class PKG extends Packager {
     return fields;
   }
 
+  get packageFileName() {
+    const p = this.properties;
+    return `${p.name}-${p.version}-${p.release}.${p.arch}${this.constructor.fileNameExtension}`;
+  }
+
   async execute(sources, options) {
     const properties = this.properties;
     const mandatoryFields = this.mandatoryFields;
@@ -83,6 +88,8 @@ package() {
       }
     ];
 
+    const [meta,content] = split(transform(sources, transformers),);
+
     await copyEntries(transform(sources, transformers), staging);
 
     await execa("makepkg", ["-f"], { cwd: staging });
@@ -127,15 +134,6 @@ const fields = {
 };
 
 /*
-  if (pkg.repository) {
-    source = pkg.repository.url;
-    if (!source.startsWith("git+")) {
-      source = "git+" + source;
-    }
-
-    directory = pkg.repository.directory ? "/" + pkg.repository.directory : "";
-  }
-
   const properties = {
     makedepends: "git"
   };

package/src/output/rpm.mjs

@@ -83,7 +83,6 @@ export class RPM extends Packager {
       `_topdir ${tmp}`,
       "-vv",
       "-bb",
-      //  `--target=${properties.arch}`,
       join(staging, specFileName)
     ]);