aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/imports/qbs/Probes/NpmProbe.qbs
diff options
context:
space:
mode:
Diffstat (limited to 'share/qbs/imports/qbs/Probes/NpmProbe.qbs')
-rw-r--r--share/qbs/imports/qbs/Probes/NpmProbe.qbs18
1 files changed, 10 insertions, 8 deletions
diff --git a/share/qbs/imports/qbs/Probes/NpmProbe.qbs b/share/qbs/imports/qbs/Probes/NpmProbe.qbs
index 4e8124d56..d0a77b421 100644
--- a/share/qbs/imports/qbs/Probes/NpmProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/NpmProbe.qbs
@@ -47,26 +47,28 @@ NodeJsProbe {
if (!interpreterPath)
throw '"interpreterPath" must be specified';
- var result = PathProbeConfigure.configure(names, nameSuffixes, nameFilter, searchPaths,
- pathSuffixes, platformSearchPaths,
- environmentPaths, platformEnvironmentPaths,
- pathListSeparator);
+ var selectors;
+ var results = PathProbeConfigure.configure(
+ selectors, names, nameSuffixes, nameFilter, searchPaths, pathSuffixes,
+ platformSearchPaths, environmentPaths, platformEnvironmentPaths,
+ pathListSeparator);
var v = new ModUtils.EnvironmentVariable("PATH", pathListSeparator,
hostOS.contains("windows"));
v.prepend(interpreterPath);
- result.npmBin = result.found
+ var result = results.files[0];
+ result.npmBin = results.found
? NodeJs.findLocation(result.filePath, "bin", v.value)
: undefined;
- result.npmRoot = result.found
+ result.npmRoot = results.found
? NodeJs.findLocation(result.filePath, "root", v.value)
: undefined;
- result.npmPrefix = result.found
+ result.npmPrefix = results.found
? NodeJs.findLocation(result.filePath, "prefix", v.value)
: undefined;
- found = result.found;
+ found = results.found;
candidatePaths = result.candidatePaths;
path = result.path;
filePath = result.filePath;