diff --git a/agents/meshcore.js b/agents/meshcore.js index 2a81535a..2b547d0f 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -1203,6 +1203,7 @@ function createMeshCore(agent) { var bash = fs.existsSync('/bin/bash') ? '/bin/bash' : false; var sh = fs.existsSync('/bin/sh') ? '/bin/sh' : false; var script = false; + /* try { if (require('linux-gnome-helpers').scriptVersion) { if (require('linux-gnome-helpers').scriptVersion.major > 2 || @@ -1211,7 +1212,8 @@ function createMeshCore(agent) { } } } catch (ex) { } - var python = fs.existsSync('/usr/bin/python') ? '/usr/bin/python' : false; + */ + var python = false; //fs.existsSync('/usr/bin/python') ? '/usr/bin/python' : false; var shell = bash || sh; var pty = python || script; diff --git a/package.json b/package.json index 81976934..168da61f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.4.8-d", + "version": "0.4.8-e", "keywords": [ "Remote Management", "Intel AMT", diff --git a/views/xterm.handlebars b/views/xterm.handlebars index f0b0d3b7..edde4148 100644 --- a/views/xterm.handlebars +++ b/views/xterm.handlebars @@ -161,6 +161,7 @@ if (resizeTimer) clearTimeout(resizeTimer); resizeTimer = setTimeout(sendResize, 200); }); + term.setOption('convertEol', true); // Consider \n to be \r\n, this should be taken care of by "termios" // Setup a terminal tunnel to the agent tunnel = CreateAgentRedirect(meshserver, CreateRemoteTunnel(tunnelUpdate, options), serverPublicNamePort, authCookie, authRelayCookie, domainUrl);