From 27bb58e4ed9725f763c768c602b62fb32d94e6c7 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Thu, 28 Apr 2016 13:17:12 -0700
Subject: [PATCH] fix(config): Rewrite contents, not just filename

---
 src/browser/application.coffee | 11 +++++++++++
 src/config.coffee              |  7 +------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/browser/application.coffee b/src/browser/application.coffee
index 205b1c3cc..b32682f8a 100644
--- a/src/browser/application.coffee
+++ b/src/browser/application.coffee
@@ -75,6 +75,17 @@ class Application
     @sharedFileManager = new SharedFileManager()
     @nylasProtocolHandler = new NylasProtocolHandler(@resourcePath, @safeMode)
 
+
+    # Temporary as we move away from cson
+    CSON = require 'season'
+    oldConfigFilePath = fs.resolve(@configDirPath, 'config.cson')
+    newConfigFilePath = path.join(@configDirPath, 'config.json')
+    if oldConfigFilePath
+      userConfig = CSON.readFileSync(oldConfigFilePath)
+      fs.writeFileSync(newConfigFilePath, JSON.stringify(userConfig, null, 2))
+      fs.unlinkSync(oldConfigFilePath)
+    # End temporary
+
     Config = require '../config'
     @config = new Config({@configDirPath, @resourcePath})
     @config.load()
diff --git a/src/config.coffee b/src/config.coffee
index bb3711d01..40f37068c 100644
--- a/src/config.coffee
+++ b/src/config.coffee
@@ -331,12 +331,7 @@ class Config
     @defaultSettings = {}
     @configFileHasErrors = false
 
-    # Temporary as we move away from cson
-    oldConfigFilePath = fs.resolve(@configDirPath, 'config.cson')
-    newConfigFilePath = path.join(@configDirPath, 'config.json')
-    if oldConfigFilePath
-      fs.renameSync(oldConfigFilePath, newConfigFilePath)
-    @configFilePath = newConfigFilePath
+    @configFilePath = path.join(@configDirPath, 'config.json')
 
     @transactDepth = 0
     @savePending = false