update files

This commit is contained in:
nuintun 2015-11-26 17:46:45 +08:00
parent 887e6a74d4
commit df15fe23ad
2 changed files with 9 additions and 4 deletions

View File

@ -87,10 +87,14 @@ module.exports = {
event.sender.send('emulator', type, project, data);
};
var env = process.env;
var env = {};
Object.keys(process.env).forEach(function (key){
env[key] = process.env[key];
});
project.env.forEach(function (item){
env[item.name] = item.value
env[item.name] = item.value;
});
emulator = new Emulator({

View File

@ -138,7 +138,7 @@ module.exports = Vue.component('app-main', {
ipc.send('emulator', {
name: this.project.name,
path: this.project.path,
env: this.project.env,
env: util.normalize(this.project.env),
command: {
name: name,
value: command
@ -195,6 +195,7 @@ module.exports = Vue.component('app-main', {
var step = 0;
ipc.on('emulator', function (event, type, project, data){
var delay = step * 16;
var runtime = window.AppRuntime[project.name];
if (runtime) {
@ -216,7 +217,7 @@ module.exports = Vue.component('app-main', {
setTimeout(function (){
runtime.xterm.write(data + '');
scroll(runtime.xterm);
}, 10 * step);
}, delay);
} else {
event.sender.send('emulator', project, 'stop');
}