From 74e2529655152c84463866183cae35e219ffb75f Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Mon, 23 Dec 2019 10:40:36 -0800 Subject: [PATCH] Updated terminal, so script command is only used on linux, as the script command on MacOS and FreeBSD does not support the required featureset. --- agents/meshcore.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/meshcore.js b/agents/meshcore.js index c6873489..73ab3b43 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -1211,9 +1211,9 @@ function createMeshCore(agent) { var setupcommands = " alias ls='ls --color=auto'\n"; if (shell == sh) setupcommands += "stty erase ^H\n" - if (script && shell) { + if (script && shell && process.platform == 'linux') { this.httprequest.process = childProcess.execFile(script, ['script', '--return', '--quiet', '-c', '"' + shell + '"', '/dev/null'], options); // Start as active user - if (process.platform == 'linux') { this.httprequest.process.stdin.write(setupcommands); } + this.httprequest.process.stdin.write(setupcommands); } else if (python && shell) { this.httprequest.process = childProcess.execFile(python, ['python', '-c', 'import pty; pty.spawn(["' + shell + '"])'], options); // Start as active user if (process.platform == 'linux') { this.httprequest.process.stdin.write(setupcommands); }