From 0b8efc434d91851dde5b18bd3d537f69416db2d5 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 13 Feb 2015 12:55:06 +0800 Subject: [PATCH] Use __dirname when setting globalPaths --- atom/browser/lib/init.coffee | 2 +- atom/common/lib/init.coffee | 2 +- atom/renderer/lib/init.coffee | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee index caf428fde079..fcdc1b11d9d5 100644 --- a/atom/browser/lib/init.coffee +++ b/atom/browser/lib/init.coffee @@ -21,7 +21,7 @@ process.argv.splice startMark, endMark - startMark + 1 # Add browser/api/lib to require's search paths, # which contains javascript part of Atom's built-in libraries. globalPaths = module.globalPaths -globalPaths.push path.join process.resourcesPath, 'atom', 'browser', 'api', 'lib' +globalPaths.push path.resolve(__dirname, '..', 'api', 'lib') # Import common settings. require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init') diff --git a/atom/common/lib/init.coffee b/atom/common/lib/init.coffee index 1410f78334f2..4fd1f8289d55 100644 --- a/atom/common/lib/init.coffee +++ b/atom/common/lib/init.coffee @@ -12,7 +12,7 @@ process.atomBinding = (name) -> # Add common/api/lib to module search paths. globalPaths = Module.globalPaths -globalPaths.push path.join(process.resourcesPath, 'atom', 'common', 'api', 'lib') +globalPaths.push path.resolve(__dirname, '..', 'api', 'lib') # setImmediate and process.nextTick makes use of uv_check and uv_prepare to # run the callbacks, however since we only run uv loop on requests, the diff --git a/atom/renderer/lib/init.coffee b/atom/renderer/lib/init.coffee index 1d900ad349b1..a11037ffc0ee 100644 --- a/atom/renderer/lib/init.coffee +++ b/atom/renderer/lib/init.coffee @@ -15,9 +15,10 @@ process.argv.splice 1, 1 # Add renderer/api/lib to require's search paths, which contains javascript part # of Atom's built-in libraries. globalPaths = Module.globalPaths -globalPaths.push path.join(process.resourcesPath, 'atom', 'renderer', 'api', 'lib') +globalPaths.push path.resolve(__dirname, '..', 'api', 'lib') # And also app. globalPaths.push path.join(process.resourcesPath, 'app') +globalPaths.push path.join(process.resourcesPath, 'app.asar') # Import common settings. require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')