From d8ba422178d501141d9f7edf305df6be5a78cc06 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Wed, 19 Jun 2013 09:33:34 -0700 Subject: [PATCH] Replace global.homeDir with app.getHomeDir() --- src/atom-application.coffee | 2 +- src/atom-window.coffee | 3 ++- src/main.coffee | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/atom-application.coffee b/src/atom-application.coffee index eaf9f428f..4096dabb1 100644 --- a/src/atom-application.coffee +++ b/src/atom-application.coffee @@ -102,7 +102,7 @@ class AtomApplication label: 'Run Specs' accelerator: 'Command+MacCtrl+Alt+S' click: => - @runSpecs(false, path.join(global.homeDir, 'github', 'atom')) + @runSpecs(false, path.join(app.getHomeDir(), 'github', 'atom')) } { type: 'separator' } { label: 'Quit', accelerator: 'Command+Q', click: -> app.quit() } diff --git a/src/atom-window.coffee b/src/atom-window.coffee index 4f7519d81..c0c8d2f46 100644 --- a/src/atom-window.coffee +++ b/src/atom-window.coffee @@ -1,4 +1,5 @@ BrowserWindow = require 'browser-window' +app = require 'app' dialog = require 'dialog' ipc = require 'ipc' path = require 'path' @@ -38,7 +39,7 @@ class AtomWindow '' ] - paths.push path.join(global.homeDir, '.atom', 'packages') + paths.push path.join(app.getHomeDir(), '.atom', 'packages') paths = paths.map (relativeOrAbsolutePath) -> path.resolve resourcePath, relativeOrAbsolutePath diff --git a/src/main.coffee b/src/main.coffee index ea7623f1f..bc952fdcc 100644 --- a/src/main.coffee +++ b/src/main.coffee @@ -9,8 +9,6 @@ optimist = require 'optimist' nslog = require 'nslog' _ = require 'underscore' -global.homeDir = app.getHomeDir() - console.log = (args...) -> nslog(args.map((arg) -> JSON.stringify(arg)).join(" ")) @@ -84,7 +82,7 @@ parseCommandLine = -> dev = true resourcePath = args['resource-path'] else if dev - resourcePath = path.join(global.homeDir, 'github', 'atom') + resourcePath = path.join(app.getHomeDir(), 'github', 'atom') try fs.statSync resourcePath