github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 06:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Gracefully handle missing config file

Browse Source 
https://circleci.com/gh/atom/atom/7630
This commit is contained in:
Jason Rudolph
2018-06-01 15:54:29 -04:00
parent 266e0111b8
commit f9ba602c6c
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main-process/start.js
View File

@@ -108,12 +108,19 @@ function setupCompileCache () {
}
function getConfig () {
const configFilePath = fs.existsSync(path.join(process.env.ATOM_HOME, 'config.json'))
? path.join(process.env.ATOM_HOME, 'config.json')
: path.join(process.env.ATOM_HOME, 'config.cson')
const configFileData = CSON.readFileSync(configFilePath)
const config = new Config()
config.resetUserSettings(configFileData)
let configFilePath
if (fs.existsSync(path.join(process.env.ATOM_HOME, 'config.json'))) {
configFilePath = path.join(process.env.ATOM_HOME, 'config.json')
} else if (fs.existsSync(path.join(process.env.ATOM_HOME, 'config.cson'))) {
configFilePath = path.join(process.env.ATOM_HOME, 'config.cson')
}
if (configFilePath) {
const configFileData = CSON.readFileSync(configFilePath)
config.resetUserSettings(configFileData)
}
return config
}