From 3cd910abc65febbd83e3b08b59232f7193c008e0 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 7 Jul 2013 11:20:30 +0800
Subject: [PATCH] Use process.resourcePath to locate js files.

---
 browser/atom/atom.coffee | 16 ++++++++--------
 vendor/brightray         |  2 +-
 vendor/node              |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/browser/atom/atom.coffee b/browser/atom/atom.coffee
index 1be0a36d7d86..bbc6c617883d 100644
--- a/browser/atom/atom.coffee
+++ b/browser/atom/atom.coffee
@@ -16,13 +16,13 @@ atom.browserMainParts =
 # implement various logics.
 global.__atom = atom
 
-# Add Atom.app/Contents/Resources/browser/api/lib to require's search paths,
+# Add browser/api/lib to require's search paths,
 # which contains javascript part of Atom's built-in libraries.  
 globalPaths = require('module').globalPaths
-globalPaths.push path.join(__dirname, '..', 'api', 'lib')
+globalPaths.push path.join process.resourcesPath, 'browser', 'api', 'lib'
 
-# And Atom.app/Contents/Resources/common/api/lib
-globalPaths.push path.join(__dirname, '..', '..', 'common', 'api', 'lib')
+# And also common/api/lib
+globalPaths.push path.join process.resourcesPath, 'common', 'api', 'lib'
 
 # Don't quit on fatal error.
 process.on 'uncaughtException', (error) ->
@@ -41,13 +41,13 @@ require './rpc-server.js'
 # Now we try to load app's package.json.
 packageJson = null
 
-packagePath = path.join __dirname, '..', '..', 'app'
+packagePath = path.join process.resourcesPath, 'app'
 try
-  # First we try to load Atom.app/Contents/Resources/app
+  # First we try to load process.resourcesPath/app
   packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json')))
 catch error
-  # If not found then we load Atom.app/Contents/Resources/browser/default_app
-  packagePath = path.join __dirname, '..', 'default_app'
+  # If not found then we load browser/default_app
+  packagePath = path.join process.resourcesPath, 'browser', 'default_app'
   packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json')))
 
 # Finally load app's main.js and transfer control to C++.
diff --git a/vendor/brightray b/vendor/brightray
index a0cd47fe1303..0805ba501cc9 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit a0cd47fe130303710ac5323c520589962311fabd
+Subproject commit 0805ba501cc9e9c4bf1cf1e265a782c53b2cc45f
diff --git a/vendor/node b/vendor/node
index 49cb96d841e3..ac5244fcaad0 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 49cb96d841e3499fb5b1355eca679a0c238fb8e3
+Subproject commit ac5244fcaad0f28f92d2db84c57c1c9b2de7ecb2