From e3434b5cde54c74c10ba0ce7be7ac694a0a9e40c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 16 Mar 2014 15:19:09 +0800
Subject: [PATCH] Fix the location default_app is copied to.

---
 atom.gyp                     | 6 +++---
 atom/browser/lib/init.coffee | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/atom.gyp b/atom.gyp
index ed4b5bac566d..cb5256c63179 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -290,7 +290,7 @@
               ],
             },
             {
-              'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/atom/browser',
+              'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
               'files': [
                 'atom/browser/default_app',
               ],
@@ -328,7 +328,7 @@
               ],
             },
             {
-              'destination': '<(PRODUCT_DIR)/resources/atom/browser',
+              'destination': '<(PRODUCT_DIR)/resources',
               'files': [
                 'atom/browser/default_app',
               ]
@@ -346,7 +346,7 @@
               ],
             },
             {
-              'destination': '<(PRODUCT_DIR)/resources/atom/browser',
+              'destination': '<(PRODUCT_DIR)/resources',
               'files': [
                 'atom/browser/default_app',
               ]
diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee
index fa69de100d08..c9ce616e99da 100644
--- a/atom/browser/lib/init.coffee
+++ b/atom/browser/lib/init.coffee
@@ -63,7 +63,7 @@ setImmediate ->
     packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json')))
   catch error
     # If not found then we load browser/default_app
-    packagePath = path.join process.resourcesPath, 'browser', 'default_app'
+    packagePath = path.join process.resourcesPath, 'default_app'
     packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json')))
 
   # Set application's version.