Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit bcde4b9

Browse files
committed
Read OpenCV version info from config object in package.json. This way we're compatible across npm@6 and npm@7
1 parent c685048 commit bcde4b9

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

install/dependencies.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,9 @@ if (!process.env["OPENCV4NODEJS_PREBUILT_SKIP_DEPENDENCIES"]) {
2121
}
2222

2323
const op = process.platform;
24-
let openCvVersion = process.env.npm_package_opencv;
2524

26-
if (!openCvVersion) {
27-
// npm 7 no longer sets fields from the package.json in process.env so lookup the package.json
28-
// file we're running from. The environment variables are different when running locally vs
29-
// as a dependency
30-
const package = require(process.env.npm_package_from || process.env.npm_package_json);
31-
openCvVersion = package.opencv;
32-
}
33-
34-
console.log(`Installing prebuilt OpenCV v${openCvVersion} for platform ${op}`);
35-
install(`@nut-tree/opencv-build-${op}@${openCvVersion}`);
25+
console.log(`Installing prebuilt OpenCV v${process.env.npm_package_config_opencv} for plattform ${op}`);
26+
install(`@nut-tree/opencv-build-${op}@${process.env.npm_package_config_opencv}`);
3627
packages[op].forEach(pkg => {
3728
console.log(`Installing additional runtime dependency '${pkg}'`);
3829
install(pkg);

0 commit comments

Comments
 (0)