Set ATOM_HOME as early as possible in render process
Moves it from window-bootstrap.coffee to index.js so it runs before the coffee cache is registered. Refs #5412
Esse commit está contido em:
@@ -1,14 +1,3 @@
|
|||||||
# Ensure ATOM_HOME is always set before anything else is required
|
|
||||||
unless process.env.ATOM_HOME
|
|
||||||
if process.platform is 'win32'
|
|
||||||
home = process.env.USERPROFILE
|
|
||||||
else
|
|
||||||
home = process.env.HOME
|
|
||||||
atomHome = path.join(home, '.atom')
|
|
||||||
try
|
|
||||||
atomHome = require('fs').realpathSync(atomHome)
|
|
||||||
process.env.ATOM_HOME = atomHome
|
|
||||||
|
|
||||||
# Like sands through the hourglass, so are the days of our lives.
|
# Like sands through the hourglass, so are the days of our lives.
|
||||||
require './window'
|
require './window'
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,23 @@ window.onload = function() {
|
|||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
|
|
||||||
|
// Ensure ATOM_HOME is always set before anything else is required
|
||||||
|
if (!process.env.ATOM_HOME) {
|
||||||
|
var home;
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
home = process.env.USERPROFILE;
|
||||||
|
} else {
|
||||||
|
home = process.env.HOME;
|
||||||
|
}
|
||||||
|
var atomHome = path.join(home, '.atom');
|
||||||
|
try {
|
||||||
|
atomHome = fs.realpathSync(atomHome);
|
||||||
|
} catch (error) {
|
||||||
|
// Ignore since the path might just not exist yet.
|
||||||
|
}
|
||||||
|
process.env.ATOM_HOME = atomHome;
|
||||||
|
}
|
||||||
|
|
||||||
// Skip "?loadSettings=".
|
// Skip "?loadSettings=".
|
||||||
var rawLoadSettings = decodeURIComponent(location.search.substr(14));
|
var rawLoadSettings = decodeURIComponent(location.search.substr(14));
|
||||||
var loadSettings;
|
var loadSettings;
|
||||||
|
|||||||
Referência em uma Nova Issue
Bloquear um usuário