docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1603 from docker/1591-update-terminal 

Updated path to work properly on linux - Fixes #1591
This commit is contained in:
French Ben 2016-04-06 14:36:30 -07:00
parent 5e0356659d 20a0a4b670
commit be6d9864ea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/DockerMachineUtil.js
View File

@ -160,9 +160,10 @@ var DockerMachine = {
}); });
} else if (util.isNative()) { } else if (util.isNative()) {
cmd = cmd || process.env.SHELL; cmd = cmd || process.env.SHELL;
var terminal = util.isLinux() ? util.linuxTerminal() : path.join(process.env.RESOURCES_PATH, 'terminal'); var terminal = util.isLinux() ? util.linuxTerminal() : [path.join(process.env.RESOURCES_PATH, 'terminal')];
terminal.push(cmd);
if (terminal) { if (terminal) {
util.execFile([terminal, cmd]).then(() => {}); util.execFile(terminal).then(() => {});
} }
} else { } else {
cmd = cmd || process.env.SHELL; cmd = cmd || process.env.SHELL;