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

use setpaths instead of command line paths

Browse Source
This commit is contained in:
Philip Weiss
2018-02-25 21:57:18 -08:00
parent bd4231b936
commit e376096e8f
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,16 +141,12 @@ module.exports = function parseCommandLine (processArgs) {
let projectSettings = {}
if (atomProject) {
const contents = Object.assign({}, readProjectSettingsSync(atomProject, executedFrom))
const paths = contents.paths
const config = contents.config
const originPath = atomProject
if (paths != null) {
const relativizedPaths = paths.map((curPath) =>
relativizeToAtomProject(curPath, atomProject, executedFrom)
)
pathsToOpen = pathsToOpen.concat(relativizedPaths)
}
console.log(pathsToOpen)
const paths = contents.paths.map((curPath) =>
relativizeToAtomProject(curPath, atomProject, executedFrom)
)
pathsToOpen.push(path.dirname(atomProject))
projectSettings = { originPath, paths, config }
}
@@ -204,11 +200,13 @@ const readProjectSettingsSync = (filepath, executedFrom) => {
try {
const readPath = path.isAbsolute(filepath) ? filepath : path.join(executedFrom, filepath)
const contents = CSON.readFileSync(readPath)
if (contents.paths || contents.config) {
if (contents.paths && contents.config) {
return contents
}
throw new Error()
} catch (e) {
throw new Error('Unable to read supplied config file.')
const errorMessage = `Unable to read supplied atomproject file. This file must have a valid array of paths, as well as a valid config object.`
throw new Error(errorMessage)
}
}