From f9ba602c6c9ab41b2fe88980fc52428c4ff60e9b Mon Sep 17 00:00:00 2001 From: Jason Rudolph Date: Fri, 1 Jun 2018 15:54:29 -0400 Subject: [PATCH] Gracefully handle missing config file https://circleci.com/gh/atom/atom/7630 --- src/main-process/start.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main-process/start.js b/src/main-process/start.js index 682532998..6daa8675d 100644 --- a/src/main-process/start.js +++ b/src/main-process/start.js @@ -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 }