github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-18 02:21:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Always provide a devResourcePath in load settings

Browse Source
This commit is contained in:
David Wilson
2018-08-22 11:48:50 -07:00
parent d5ac645b3e
commit bb1f7b0a2f
3 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main-process/parse-command-line.js
View File

@@ -6,7 +6,7 @@ const {app} = require('electron')
const path = require('path')
const fs = require('fs-plus')
module.exports = function parseCommandLine (processArgs, initialResourcePath) {
module.exports = function parseCommandLine (processArgs, resourcePath, devResourcePath) {
const options = yargs(processArgs).wrap(yargs.terminalWidth())
const version = app.getVersion()
options.usage(
@@ -119,8 +119,6 @@ module.exports = function parseCommandLine (processArgs, initialResourcePath) {
let pathsToOpen = []
let urlsToOpen = []
let devMode = args['dev']
let devResourcePath = initialResourcePath
let resourcePath = null
for (const path of args._) {
if (path.startsWith('atom://')) {
@@ -130,21 +128,8 @@ module.exports = function parseCommandLine (processArgs, initialResourcePath) {
}
}
if (args['resource-path']) {
if (args['resource-path'] || test) {
devMode = true
devResourcePath = args['resource-path']
}
if (test) {
devMode = true
}
if (devMode) {
resourcePath = devResourcePath
}
if (!fs.statSyncNoException(resourcePath)) {
resourcePath = path.dirname(path.dirname(__dirname))
}
if (args['path-environment']) {