Fixing menu, adding Docker terminal

This commit is contained in:
Jeffrey Morgan 2015-02-13 00:03:25 -08:00
parent dc469af25c
commit f3d719756b
3 changed files with 34 additions and 2 deletions

View File

@ -10,6 +10,8 @@ var boot2docker = require('./boot2docker');
var ContainerStore = require('./ContainerStore');
var SetupStore = require('./SetupStore');
var settingsjson;
var Menu = require('./Menu');
try {
settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'settings.json'), 'utf8'));
} catch (err) {

View File

@ -1,8 +1,14 @@
var remote = require('remote');
var app = remote.require('app');
var path = require('path');
var docker = require('./Docker');
var boot2docker = require('./Boot2Docker');
var _ = require('underscore');
var Menu = remote.require('menu');
var BrowserWindow = remote.require('browser-window');
var router = require('./Router');
var util = require('./Util');
var assign = require('object-assign');
// main.js
var template = [
@ -59,6 +65,28 @@ var template = [
},
]
},
{
label: 'File',
submenu: [
{
label: 'New Container',
accelerator: 'Command+N',
selector: 'undo:'
},
{
type: 'separator'
},
{
label: 'Open Docker Terminal',
accelerator: 'Command+Shift+T',
click: function() {
var terminal = path.join(process.cwd(), 'resources', 'terminal');
var cmd = [terminal, `DOCKER_HOST=${'tcp://' + docker.host + ':2376'} DOCKER_CERT_PATH=${path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/boot2docker-vm')} DOCKER_TLS_VERIFY=1 $SHELL`];
util.exec(cmd).then(() => {});
}
},
]
},
{
label: 'Edit',
submenu: [

View File

@ -4,9 +4,11 @@ var fs = require('fs');
var path = require('path');
module.exports = {
exec: function (args) {
exec: function (args, options) {
options = options || {};
return new Promise((resolve, reject) => {
exec(args, (stderr, stdout, code) => {
console.log(options);
exec(args, options, (stderr, stdout, code) => {
if (code) {
reject(stderr);
}