npm-pkgbuild 22.1.0 → 22.1.2

package/README.md

@@ -348,6 +348,9 @@ Source of package content.
 ### Properties
 
 *   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `destination` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `defaultProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+*   `permissions` **[Map](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Map)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object), [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
 
 ### propertiesFor
 
@@ -356,7 +359,7 @@ Source of package content.
 *   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 *   `isCollection` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
 
-Returns **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))**&#x20;
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
 
 ### asyncIterator
 

package/package.json

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

package/src/output/alpm.mjs

@@ -137,7 +137,11 @@ export class ALPM extends Packager {
       default: ["any"],
       mandatory: true
     },
-    backup: { ...string_collection_attribute_writable, name: "backup", skipEmpty: true },
+    backup: {
+      ...string_collection_attribute_writable,
+      name: "backup",
+      skipEmpty: true
+    },
     depends: {
       ...dependency_attribute_collection_writable /*, alias: "dependencies" */,
       name: "depends"
@@ -156,10 +160,15 @@ export class ALPM extends Packager {
     },
     conflicts: {
       ...dependency_attribute_collection_writable,
-      name: "conflicts"
+      name: "conflicts",
+      skipEmpty: true
     },
     provides: { ...dependency_attribute_collection_writable, name: "provides" },
-    replaces: { ...dependency_attribute_collection_writable, name: "replaces" },
+    replaces: {
+      ...dependency_attribute_collection_writable,
+      name: "replaces",
+      skipEmpty: true
+    },
     options: { ...default_attribute, name: "options" }
   };
 
@@ -241,7 +250,7 @@ package() {
 
   if [ "$(ls -A $srcdir)" ]
   then
-    #cp -rp $srcdir/* "$pkgdir"
+    cp -rp $srcdir/* "$pkgdir"
 ### PERMISSION ###
 
     ${verbose}
@@ -271,37 +280,33 @@ package() {
       createEntryWhenMissing: () => new ContentEntry(PKGBUILD)
     });
 
-    const install = [];
+    const permission = [];
 
     for await (const file of copyEntries(
       transform(aggregate(sources), transformer),
       join(staging, "src"),
       expander
     )) {
-      const flags = {
-        user: ["-o", value => value],
-        group: ["-g", value => value],
-        mode: ["-m", value => Number(value & 0o7777).toString(8)]
-      };
-
-      const options = [];
-      for (const [name, config] of Object.entries(flags)) {
-        const value = await file[name];
-
-        if (value !== undefined) {
-          options.push(`${config[0]} ${config[1](value)}`);
-        }
+      if(file.destination !== '../PKGBUILD') {
+      if (file.owner || file.group) {
+        permission.push(
+          `    chown ${[file.owner ?? "", file.group ?? ""].join(":")} \"$pkgdir/${file.destination}\"`
+        );
+      }
+      const mode = (await file.mode) & 0o7777;
+      if (mode) {
+        permission.push(
+          `    chmod ${Number(mode).toString(8)} \"$pkgdir/${file.destination}\"`
+        );
+      }
       }
-      install.push(
-        `    install ${file.isBlob ? "-D" : "-d"} ${options.join(" ")} \"$srcdir/${file.name}\" \"$pkgdir/${file.destination}\"`
-      );
 
       if (options.verbose) {
         console.log(file.destination);
       }
     }
 
-    if (install.length) {
+    if (permission.length) {
       const pkgbuild = join(staging, PKGBUILD);
       const content = await readFile(pkgbuild, utf8StreamOptions);
       const markerPos = content.indexOf("### PERMISSION ###");
@@ -309,7 +314,7 @@ package() {
       await writeFile(
         pkgbuild,
         content.substring(0, markerPos) +
-          install.join("\n") +
+          permission.join("\n") +
           content.substring(markerPos + 18),
         utf8StreamOptions
       );