npm-pkgbuild 9.0.2 → 10.0.1

package/README.md

@@ -18,16 +18,23 @@ Create ArchLinux, RPM and Debian packages from npm packages.
 In a package directory execute
 
 ```shell
-npm-pkgbuild --rpm --debian --arch --content build
+npm-pkgbuild --rpm --debian --arch --content build --publish /some/directory
 ```
 
 This will create a arch, rpm and a debian package of the build dir.
 
+
+## upload package
+
+```shell
+npm-pkgbuild --rpm --debian --arch --content build --publish 'https://my.package-service.com/binaries/linux/{{type}}/{{access}}/{{arch}}'
+```
+
 You can specify the package content in package.json.
 
 ```json
 {
-	"pkg": {
+	"pkgbuild": {
 		"content": {
 			"/some/location" : { "base": "build" },
 			"/etc/myconfig.json" : "sample-config.json",
@@ -77,6 +84,7 @@ options:
 ### Table of Contents
 
 - [usage](#usage)
+  - [upload package](#upload-package)
 - [content providers](#content-providers)
 - [files (default)](#files-default)
   - [npm-pack](#npm-pack)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "9.0.2",
+  "version": "10.0.1",
   "publishConfig": {
     "access": "public"
   },
@@ -40,7 +40,7 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "@npmcli/arborist": "^5.1.0",
+    "@npmcli/arborist": "^5.1.1",
     "aggregate-async-iterator": "^1.1.10",
     "commander": "^9.2.0",
     "content-entry": "^5.0.0",

package/src/extract-from-package.mjs

@@ -76,7 +76,7 @@ export async function extractFromPackage(json, dir) {
   let arch = new Set();
 
   const processPkg = (json, dir, modulePath) => {
-    const pkg = json.pkg;
+    const pkg = json.pkgbuild;
 
     if (pkg) {
       if (json.cpu) {

package/src/npm-pkgbuild-cli.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { readFileSync } from "fs";
+import { fileURLToPath } from "url";
 import { readFile } from "fs/promises";
 import { join } from "path";
 import { program } from "commander";
@@ -20,8 +21,10 @@ import {
 } from "npm-pkgbuild";
 
 const { version, description } = JSON.parse(
-  readFileSync(new URL("../package.json", import.meta.url).pathname),
-  utf8StreamOptions
+  readFileSync(
+    fileURLToPath(new URL("../package.json", import.meta.url)),
+    utf8StreamOptions
+  )
 );
 
 program.description(description).version(version);
@@ -45,13 +48,20 @@ program
   )
   .option("-m --meta <dir>", "meta directory", (c, a) => a.concat([c]), [])
   .addOption(
-    new program.Option("--publish <url>", "publishing url of the package")
+    new program.Option(
+      "--publish <url>",
+      "publishing url (or directory) of the package"
+    )
       .env("PKGBUILD_PUBLISH")
       .argParser(value => {
         let values = value.split(/,/);
         if (values.length > 1) {
           values = values.map(v => process.env[v] || v);
-          return { url: values[0], user: values[1], password: decodePassword(values[2]) };
+          return {
+            url: values[0],
+            user: values[1],
+            password: decodePassword(values[2])
+          };
         }
 
         return { url: value };
@@ -135,7 +145,7 @@ program
       }
     } catch (e) {
       console.error(e);
-      if(!options.continue) {
+      if (!options.continue) {
         process.exit(-1);
       }
     }

package/src/output/debian.mjs

@@ -93,10 +93,13 @@ export class DEBIAN extends Packager {
       )
     );
 
-    properties.Depends = Object.entries(dependencies).map(
-      ([name, e]) => `${packageNameMapping[name] ? packageNameMapping[name] : name} (${e})`
-    );
-
+    if (Object.keys(dependencies).length > 0) {
+      properties.Depends = Object.entries(dependencies).map(
+        ([name, e]) =>
+          `${packageNameMapping[name] ? packageNameMapping[name] : name} (${e})`
+      );
+    }
+    
     const fp = fieldProvider(properties, fields);
     const debianControlName = "DEBIAN/control";