Use sibling .atom when non-standard installer location

Esse commit está contido em:
Kevin Sawicki
2015-02-03 17:00:37 -08:00
commit 76f37277d9
+11 -1
Ver Arquivo
@@ -14,6 +14,7 @@ process.on 'uncaughtException', (error={}) ->
nslog(error.stack) if error.stack? nslog(error.stack) if error.stack?
start = -> start = ->
setupAtomHome()
if process.platform is 'win32' if process.platform is 'win32'
SquirrelUpdate = require './squirrel-update' SquirrelUpdate = require './squirrel-update'
squirrelCommand = process.argv[1] squirrelCommand = process.argv[1]
@@ -76,6 +77,16 @@ setupCoffeeScript = ->
setupAtomHome = -> setupAtomHome = ->
return if process.env.ATOM_HOME return if process.env.ATOM_HOME
# Use install-relative .atom path on Windows when using the installer version
# in a non-default version. This enables an easy portable version.
if process.platform is 'win32'
SquirrelUpdate = require './squirrel-update'
if SquirrelUpdate.existsSync()
atomPath = path.join(process.env.LOCALAPPDATA, 'atom').toLowerCase()
if __dirname.toLowerCase().indexOf(atomPath) isnt 0
process.env.ATOM_HOME = path.join(rootAtomFolder, '.atom')
return
if process.platform is 'win32' if process.platform is 'win32'
home = process.env.USERPROFILE home = process.env.USERPROFILE
else else
@@ -162,5 +173,4 @@ parseCommandLine = ->
{resourcePath, pathsToOpen, executedFrom, test, version, pidToKillWhenClosed, devMode, safeMode, newWindow, specDirectory, logFile} {resourcePath, pathsToOpen, executedFrom, test, version, pidToKillWhenClosed, devMode, safeMode, newWindow, specDirectory, logFile}
setupAtomHome()
start() start()