Update requires paths

diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index 69e7906..608cc94 100644 (file)
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -165,7 +165,6 @@ node::Environment* NodeBindings::CreateEnvironment(
   base::FilePath script_path =
       resources_path.Append(FILE_PATH_LITERAL("atom.asar"))
                     .Append(process_type)
-                    .Append(FILE_PATH_LITERAL("lib"))
                     .Append(FILE_PATH_LITERAL("init.js"));
   std::string script_path_str = script_path.AsUTF8Unsafe();
   args.insert(args.begin() + 1, script_path_str.c_str());

diff --git a/lib/browser/api/exports/electron.js b/lib/browser/api/exports/electron.js
index 7f97fcd..ea9dd6e 100644 (file)
--- a/lib/browser/api/exports/electron.js
+++ b/lib/browser/api/exports/electron.js
@@ -1,4 +1,4 @@
-const common = require('../../../../common/api/lib/exports/electron');
+const common = require('../../../common/api/exports/electron');
 
 
 // Import common modules.

diff --git a/lib/browser/init.js b/lib/browser/init.js
index 4769fae..d6a1836 100644 (file)
--- a/lib/browser/init.js
+++ b/lib/browser/init.js
@@ -11,19 +11,19 @@ var slice = [].slice;
 process.argv.splice(1, 1);
 
 // Clear search paths.
-require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths'));
+require(path.resolve(__dirname, '..', 'common', 'reset-search-paths'));
 
 // Import common settings.
-require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'init'));
+require(path.resolve(__dirname, '..', 'common', 'init'));
 
 var globalPaths = Module.globalPaths;
 
 if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
-  globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib'));
+  globalPaths.push(path.resolve(__dirname, 'api'));
 }
 
 // Expose public APIs.
-globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib', 'exports'));
+globalPaths.push(path.resolve(__dirname, 'api', 'exports'));
 
 if (process.platform === 'win32') {
   // Redirect node's console to use our own implementations, since node can not

diff --git a/lib/renderer/api/exports/electron.js b/lib/renderer/api/exports/electron.js
index 3f0d325..34a498f 100644 (file)
--- a/lib/renderer/api/exports/electron.js
+++ b/lib/renderer/api/exports/electron.js
@@ -1,4 +1,4 @@
-const common = require('../../../../common/api/lib/exports/electron');
+const common = require('../../../common/api/exports/electron');
 
 // Import common modules.
 common.defineProperties(exports);

diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index 07aa247..42435d8 100644 (file)
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -244,7 +244,7 @@ ipcRenderer.on('ATOM_RENDERER_RELEASE_CALLBACK', function(event, id) {
 });
 
 // List all built-in modules in browser process.
-const browserModules = require('../../../browser/api/lib/exports/electron');
+const browserModules = require('../../browser/api/exports/electron');
 
 // And add a helper receiver for each one.
 var fn = function(name) {

diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index 166e642..334aebd 100644 (file)
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -9,19 +9,19 @@ const Module = require('module');
 process.argv.splice(1, 1);
 
 // Clear search paths.
-require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths'));
+require(path.resolve(__dirname, '..', 'common', 'reset-search-paths'));
 
 // Import common settings.
-require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'init'));
+require(path.resolve(__dirname, '..','common', 'init'));
 
 var globalPaths = Module.globalPaths;
 
 if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
-  globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib'));
+  globalPaths.push(path.resolve(__dirname, 'api'));
 }
 
 // Expose public APIs.
-globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib', 'exports'));
+globalPaths.push(path.resolve(__dirname, 'api', 'exports'));
 
 // The global variable will be used by ipc for event dispatching
 var v8Util = process.atomBinding('v8_util');