Merge branch 'master' of github.com:kitematic/kitematic

This commit is contained in:
Jeffrey Morgan
2015-06-08 13:04:37 -07:00

View File

@@ -102,8 +102,12 @@ var ContainerDetailsSubheader = React.createClass({
if (!this.disableTerminal()) {
metrics.track('Terminaled Into Container');
var container = this.props.container;
var shell = ContainerUtil.env(container).SHELL;
if(typeof shell === 'undefined') {
var shell = ContainerUtil.env(container).reduce((envs, env) => {
envs[env[0]] = env[1];
return envs;
}, {}).SHELL;
if(!shell) {
shell = 'sh';
}
machine.ip().then(ip => {