mirror of https://github.com/docker/docs.git
Reverting atom-shell native meteor require changes
This commit is contained in:
parent
7d2449e611
commit
4433b91982
38
index.js
38
index.js
|
@ -65,16 +65,32 @@ var start = function (callback) {
|
||||||
console.log('Starting node child...');
|
console.log('Starting node child...');
|
||||||
var rootURL = 'http://localhost:' + webPort;
|
var rootURL = 'http://localhost:' + webPort;
|
||||||
var user_env = process.env;
|
var user_env = process.env;
|
||||||
process.env.ROOT_URL = rootURL;
|
user_env.ROOT_URL = rootURL;
|
||||||
process.env.PORT = webPort;
|
user_env.PORT = webPort;
|
||||||
process.env.BIND_IP = '127.0.0.1';
|
user_env.BIND_IP = '127.0.0.1';
|
||||||
process.env.DB_PATH = dataPath;
|
user_env.DB_PATH = dataPath;
|
||||||
process.env.MONGO_URL = 'mongodb://localhost:' + mongoPort + '/meteor';
|
user_env.MONGO_URL = 'mongodb://localhost:' + mongoPort + '/meteor';
|
||||||
process.env.METEOR_SETTINGS = fs.readFileSync(path.join(__dirname, 'resources', 'settings.json'), 'utf8');
|
user_env.METEOR_SETTINGS = fs.readFileSync(path.join(__dirname, 'resources', 'settings.json'), 'utf8');
|
||||||
process.env.DIR = __dirname;
|
user_env.DIR = __dirname;
|
||||||
process.env.NODE_ENV = 'production';
|
user_env.NODE_ENV = 'production';
|
||||||
process.env.NODE_PATH = path.join(__dirname, 'node_modules');
|
user_env.NODE_PATH = path.join(__dirname, 'node_modules');
|
||||||
require('./bundle/main.js');
|
var nodeChild = child_process.spawn(path.join(__dirname, 'resources', 'node'), [path.join(__dirname, 'bundle', 'main.js')], {
|
||||||
|
env: user_env
|
||||||
|
});
|
||||||
|
|
||||||
|
var opened = false;
|
||||||
|
nodeChild.stdout.setEncoding('utf8');
|
||||||
|
nodeChild.stdout.on('data', function (data) {
|
||||||
|
console.log(data);
|
||||||
|
if (data.indexOf('Kitematic started.') !== -1) {
|
||||||
|
if (!opened) {
|
||||||
|
opened = true;
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
callback(rootURL, nodeChild, mongoChild);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -86,7 +102,7 @@ var start = function (callback) {
|
||||||
mainWindow = null;
|
mainWindow = null;
|
||||||
|
|
||||||
app.on('activate-with-no-open-windows', function () {
|
app.on('activate-with-no-open-windows', function () {
|
||||||
if (!mainWindow) {
|
if (mainWindow) {
|
||||||
mainWindow.show();
|
mainWindow.show();
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue