XTerm fixes.
Ylian Saint-Hilaire committed
Jan 28, 2020 at 15:49 UTC
80192cf703e79ace016c7e06bece700e1904b4bd
3 files changed
+5
-2
agents/meshcore.js
+3
-1
@@ -1203,6 +1203,7 @@ function createMeshCore(agent) {
1203
var bash = fs.existsSync('/bin/bash') ? '/bin/bash' : false;
1204
var sh = fs.existsSync('/bin/sh') ? '/bin/sh' : false;
1205
var script = false;
1206
+ /*
1207
try {
1208
if (require('linux-gnome-helpers').scriptVersion) {
1209
if (require('linux-gnome-helpers').scriptVersion.major > 2 ||
@@ -1211,7 +1212,8 @@ function createMeshCore(agent) {
1212
}
1213
}
1214
} catch (ex) { }
1214
- var python = fs.existsSync('/usr/bin/python') ? '/usr/bin/python' : false;
1215
+ */
1216
+ var python = false; //fs.existsSync('/usr/bin/python') ? '/usr/bin/python' : false;
1217
var shell = bash || sh;
1218
var pty = python || script;
1219
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.4.8-d",
3
+ "version": "0.4.8-e",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
views/xterm.handlebars
+1
@@ -161,6 +161,7 @@
161
if (resizeTimer) clearTimeout(resizeTimer);
162
resizeTimer = setTimeout(sendResize, 200);
163
});
164
+ term.setOption('convertEol', true); // Consider \n to be \r\n, this should be taken care of by "termios"
165
166
// Setup a terminal tunnel to the agent
167
tunnel = CreateAgentRedirect(meshserver, CreateRemoteTunnel(tunnelUpdate, options), serverPublicNamePort, authCookie, authRelayCookie, domainUrl);