mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Include trailing separator in comparisons

Browse source
This commit is contained in:
Kevin Sawicki 2016-06-23 15:45:08 -07:00
parent c6906deef2
commit 905e9e9645
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/common/reset-search-paths.js
View file

@ -12,10 +12,11 @@ module.parent.paths = []
const originalNodeModulePaths = Module._nodeModulePaths const originalNodeModulePaths = Module._nodeModulePaths
Module._nodeModulePaths = function (from) { Module._nodeModulePaths = function (from) {
const paths = originalNodeModulePaths(from) const paths = originalNodeModulePaths(from)
const rootPath = process.resourcesPath
// If "from" is outside the app then we do nothing. // If "from" is outside the app then we do nothing.
const skipOutsidePaths = path.resolve(from).startsWith(rootPath) const rootPath = process.resourcesPath + path.sep
const fromPath = path.resolve(from) + path.sep
const skipOutsidePaths = fromPath.startsWith(rootPath)
if (skipOutsidePaths) { if (skipOutsidePaths) {
return paths.filter(function (candidate) { return paths.filter(function (candidate) {
return candidate.startsWith(rootPath) return candidate.startsWith(rootPath)