npm-pkgbuild 11.2.5 → 11.2.7
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.
- package/README.md +6 -0
- package/package.json +1 -1
- package/src/output/arch.mjs +7 -6
- package/src/output/docker.mjs +1 -1
package/README.md
CHANGED
|
@@ -127,6 +127,7 @@ see [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
|
|
|
127
127
|
* [execute](#execute)
|
|
128
128
|
* [Parameters](#parameters-10)
|
|
129
129
|
* [prepare](#prepare)
|
|
130
|
+
* [Parameters](#parameters-11)
|
|
130
131
|
|
|
131
132
|
## ContentProvider
|
|
132
133
|
|
|
@@ -326,6 +327,11 @@ Execute package generation
|
|
|
326
327
|
|
|
327
328
|
Check for rpmbuild presence.
|
|
328
329
|
|
|
330
|
+
### Parameters
|
|
331
|
+
|
|
332
|
+
* `options`  
|
|
333
|
+
* `variant`  
|
|
334
|
+
|
|
329
335
|
Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** true when rpmbuild is present
|
|
330
336
|
|
|
331
337
|
# install
|
package/package.json
CHANGED
package/src/output/arch.mjs
CHANGED
|
@@ -92,18 +92,21 @@ export class ARCH extends Packager {
|
|
|
92
92
|
.substring(i)
|
|
93
93
|
.split(/\n/)[0]
|
|
94
94
|
.match(/='([^'"]+)['"]/);
|
|
95
|
-
return m[1];
|
|
95
|
+
return m && m[1];
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
_ext = getValue("PKGEXT");
|
|
99
99
|
_architecture = getValue("CARCH");
|
|
100
100
|
_prepared = true;
|
|
101
|
-
} catch {
|
|
101
|
+
} catch(e) {
|
|
102
102
|
_prepared = false;
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
|
+
// console.log("ARCH", variant.arch, _architecture,
|
|
106
|
+
// _prepared, (variant.arch === undefined || variant.arch === _architecture));
|
|
107
|
+
|
|
105
108
|
return _prepared && (variant.arch === undefined || variant.arch === _architecture);
|
|
106
|
-
|
|
109
|
+
}
|
|
107
110
|
|
|
108
111
|
get packageFileName() {
|
|
109
112
|
const p = this.properties;
|
|
@@ -256,8 +259,6 @@ function normalizeExpression(e) {
|
|
|
256
259
|
function makeDepends(dependencies) {
|
|
257
260
|
return Object.entries(dependencies).map(
|
|
258
261
|
([name, version]) =>
|
|
259
|
-
`${
|
|
260
|
-
packageNameMapping[name] ? packageNameMapping[name] : name
|
|
261
|
-
}${normalizeExpression(version)}`
|
|
262
|
+
`${packageNameMapping[name] || name}${normalizeExpression(version)}`
|
|
262
263
|
);
|
|
263
264
|
}
|