npm-pkgbuild 20.9.2 → 20.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "20.9.2",
+  "version": "20.9.3",
   "publishConfig": {
     "access": "public",
     "provenance": false

package/src/content/content-provider.mjs

@@ -36,7 +36,7 @@ export class ContentProvider {
    *
    * @param {string} name
    * @param {boolean} isCollection
-   * @returns {Object}
+   * @returns {Object|undefined}
    */
   propertiesFor(name, isCollection) {
     for (const [pattern, properties] of Object.entries(this.properties)) {

package/src/output/arch.mjs

@@ -231,7 +231,7 @@ export class ARCH extends Packager {
     }
 
     const depends = this.makeDepends(properties.dependencies).join(" ");
-    const dependsStatement = depends.length ? `depends=(${depends})`: "";
+    const dependsStatement = depends.length ? `depends=(${depends})` : "";
     const verbose = options.verbose ? 'ls -laR "$pkgdir"' : "";
 
     async function* trailingLines() {
@@ -278,7 +278,7 @@ package() {
       join(staging, "src"),
       expander
     )) {
-      if (file.owner || file.group || file.mode) {
+      if (file.user || file.group || file.mode) {
         permissions.push(file);
       }
 
@@ -292,17 +292,25 @@ package() {
       let content = await readFile(pkgbuild, utf8StreamOptions);
       const markerPos = content.indexOf("### PERMISSION ###");
 
+      const flags = {
+        user: ["-u", f => f.user],
+        group: ["-g", f => f.group],
+        mode: ["-m", f => Number(f.mode).toString(8)]
+      };
+
       content =
         content.substring(0, markerPos) +
         permissions
-          .filter(f=>f.user||f.group).map(
-            f =>
-              `    chown ${[f.owner ?? "", f.group ?? ""].join(
-                ":"
-              )} \"$pkgdir/${f.destination}\"`
-          )
+          .filter(f=>f.isBlob)
+          .map(f => {
+            const options = Object.keys(flags)
+              .filter(name => f[name])
+              .map(name => `${flags[name][0]} ${flags[name][1](f)}`)
+              .join(" ");
+            return `    install -D ${options} \"$srcdir/${f.name}\" \"$pkgdir/${f.destination}\"`;
+          })
           .join("\n") +
-        content.substring(markerPos + 14);
+        content.substring(markerPos + 18);
 
       await writeFile(pkgbuild, content, utf8StreamOptions);
     }