npm-pkgbuild 7.14.4 → 7.14.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/package.json +1 -1
  2. package/src/content/npm-pack-content-provider.mjs +1 -5
  3. package/src/extract-from-package.mjs +1 -1
  4. package/src/npm-pkgbuild-cli.mjs +1 -1
  5. package/src/output/arch.mjs +1 -1
  6. package/src/output/rpm.mjs +3 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "npm-pkgbuild",
3
- "version": "7.14.4",
3
+ "version": "7.14.8",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
package/src/content/npm-pack-content-provider.mjs CHANGED
@@ -27,15 +27,13 @@ export class NPMPackContentProvider extends ContentProvider {
27
27
  }
28
28
 
29
29
  async *[Symbol.asyncIterator]() {
30
- console.log("pacote", this.dir);
31
-
32
30
  const entries = [];
33
31
 
34
32
  await pacote.tarball.stream(this.dir, async stream => {
35
33
  const extract = tar.extract();
36
34
 
37
35
  extract.on("entry", async (header, stream, next) => {
38
- // console.log(header);
36
+ console.log(header.name);
39
37
  stream.on("end", () => next());
40
38
 
41
39
  const chunks = [];
@@ -43,8 +41,6 @@ export class NPMPackContentProvider extends ContentProvider {
43
41
  chunks.push(chunk);
44
42
  }
45
43
 
46
- console.log(header.name.substring);
47
-
48
44
  entries.push(
49
45
  Object.assign(
50
46
  new BufferContentEntry(
package/src/extract-from-package.mjs CHANGED
@@ -75,7 +75,7 @@ export async function extractFromPackage(pkg, dir) {
75
75
  new type({ ...definition, dir }, entryProperties)
76
76
  );
77
77
  } else {
78
- console.error("Unknown type '${type}'");
78
+ console.error(`Unknown type '${type}'`);
79
79
  }
80
80
  } else {
81
81
  sources.push(
package/src/npm-pkgbuild-cli.mjs CHANGED
@@ -94,7 +94,7 @@ program
94
94
  );
95
95
 
96
96
  const context = createContext({ properties });
97
- const output = new outputFactory(properties);
97
+ const output = new outputFactory(context.expand(properties));
98
98
  const transformer = [createExpressionTransformer(properties)];
99
99
 
100
100
  if (options.verbose) {
package/src/output/arch.mjs CHANGED
@@ -78,7 +78,7 @@ export class ARCH extends Packager {
78
78
  package() {
79
79
  depends=(${makeDepends(dependencies)
80
80
  .map(v => quote(v))
81
- .join(",")})
81
+ .join(" ")})
82
82
 
83
83
  if [ "$(ls -A $srcdir)" ]
84
84
  then
package/src/output/rpm.mjs CHANGED
@@ -42,6 +42,8 @@ export class RPM extends Packager {
42
42
  const properties = this.properties;
43
43
  const tmp = await this.tmpdir;
44
44
 
45
+ properties.Requires = Object.entries(dependencies).map(([n,e]) => `${n}${e}`).join(' ');
46
+
45
47
  await Promise.all(
46
48
  ["BUILDROOT", "RPMS", "SRPMS", "SOURCES", "SPECS"].map(d =>
47
49
  mkdir(join(tmp, d))
@@ -71,7 +73,7 @@ export class RPM extends Packager {
71
73
  expander
72
74
  )) {
73
75
  if (options.verbose) {
74
- console.log(file);
76
+ console.log(file.destination);
75
77
  }
76
78
  yield file.destination + "\n";
77
79
  }