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

set default path inside of project.replace

Browse Source
This commit is contained in:
Philip Weiss
2018-03-09 14:04:21 -08:00
parent 9282f07d07
commit e14ffb9420
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,11 +146,16 @@ module.exports = function parseCommandLine (processArgs) {
const contents = Object.assign({}, readProjectSpecificationSync(readPath, executedFrom))
const pathToProjectFile = path.join(executedFrom, projectSpecificationFile)
const base = path.dirname(pathToProjectFile)
pathsToOpen.push(path.dirname(projectSpecificationFile))
const paths = (contents.paths == null)
? undefined
: contents.paths.map(curPath => path.resolve(base, curPath))
projectSpecification = {
originPath: projectSpecificationFile,
paths: contents.paths.map(curPath => path.resolve(base, curPath)),
originPath: pathToProjectFile,
paths,
config: contents.config
}
}
@@ -171,6 +176,7 @@ module.exports = function parseCommandLine (processArgs) {
resourcePath = normalizeDriveLetterName(resourcePath)
devResourcePath = normalizeDriveLetterName(devResourcePath)
return {
projectSpecification,
resourcePath,
@@ -206,9 +212,6 @@ function readProjectSpecificationSync (filepath, executedFrom) {
throw new Error('Unable to read supplied project specification file.')
}
if (contents.paths == null) {
contents.paths = [path.dirname(filepath)]
}
contents.config = (contents.config == null) ? {} : contents.config
return contents
}