github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use OS independent functions to resolve local plugin path

Browse Source 
Fixes #6345.
This commit is contained in:
Martijn Walraven
2016-02-25 21:35:10 +01:00
parent e129879702
commit 6429f47294
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cordova/project.js vendored
View File

@@ -1,6 +1,5 @@
import _ from 'underscore';
import util from 'util';
import path from 'path';
import assert from 'assert';
import chalk from 'chalk';
import semver from 'semver';
@@ -463,7 +462,8 @@ from Cordova project`, async () => {
// We need to check if the directory exists ourselves because Cordova
// will try to install from npm (and fail with an unhelpful error message)
// if the directory is not found
if (!cordova_util.isDirectory(pluginPath)) {
const stat = files.statOrNull(pluginPath);
if (!(stat && stat.isDirectory())) {
buildmessage.error(`Couldn't find local directory \
'${files.convertToOSPath(pluginPath)}' \
(while attempting to install plugin ${id}).`);
@@ -480,7 +480,7 @@ from Cordova project`, async () => {
resolveLocalPluginPath(pluginPath) {
pluginPath = pluginPath.substr("file://".length);
if (utils.isPathRelative(pluginPath)) {
return path.resolve(this.projectContext.projectDir, pluginPath);
return files.pathResolve(this.projectContext.projectDir, pluginPath);
} else {
return pluginPath;
}