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

Fix the location default_app is copied to.

Browse source
This commit is contained in:
Cheng Zhao 2014-03-16 15:19:09 +08:00
parent 5dd5f18edf
commit e3434b5cde
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom.gyp
View file

@ -290,7 +290,7 @@
], ],
}, },
{ {
'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/atom/browser', 'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
'files': [ 'files': [
'atom/browser/default_app', 'atom/browser/default_app',
], ],
@ -328,7 +328,7 @@
], ],
}, },
{ {
'destination': '<(PRODUCT_DIR)/resources/atom/browser', 'destination': '<(PRODUCT_DIR)/resources',
'files': [ 'files': [
'atom/browser/default_app', 'atom/browser/default_app',
] ]
@ -346,7 +346,7 @@
], ],
}, },
{ {
'destination': '<(PRODUCT_DIR)/resources/atom/browser', 'destination': '<(PRODUCT_DIR)/resources',
'files': [ 'files': [
'atom/browser/default_app', 'atom/browser/default_app',
] ]

2
atom/browser/lib/init.coffee
View file

@ -63,7 +63,7 @@ setImmediate ->
packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json'))) packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json')))
catch error catch error
# If not found then we load browser/default_app # 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'))) packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json')))
# Set application's version. # Set application's version.