MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-09 12:48:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

XTerm fixes.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-01-28 15:49:33 -08:00
parent ecc42f7848
commit 80192cf703
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agents/meshcore.js
View File

@ -1203,6 +1203,7 @@ function createMeshCore(agent) {
var bash = fs.existsSync('/bin/bash') ? '/bin/bash' : false; var bash = fs.existsSync('/bin/bash') ? '/bin/bash' : false;
var sh = fs.existsSync('/bin/sh') ? '/bin/sh' : false; var sh = fs.existsSync('/bin/sh') ? '/bin/sh' : false;
var script = false; var script = false;
/*
try { try {
if (require('linux-gnome-helpers').scriptVersion) { if (require('linux-gnome-helpers').scriptVersion) {
if (require('linux-gnome-helpers').scriptVersion.major > 2 || if (require('linux-gnome-helpers').scriptVersion.major > 2 ||
@ -1211,7 +1212,8 @@ function createMeshCore(agent) {
} }
} }
} catch (ex) { } } 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 shell = bash || sh;
var pty = python || script; var pty = python || script;

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.4.8-d", "version": "0.4.8-e",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

1
views/xterm.handlebars
View File

@ -161,6 +161,7 @@
if (resizeTimer) clearTimeout(resizeTimer); if (resizeTimer) clearTimeout(resizeTimer);
resizeTimer = setTimeout(sendResize, 200); 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 // Setup a terminal tunnel to the agent
tunnel = CreateAgentRedirect(meshserver, CreateRemoteTunnel(tunnelUpdate, options), serverPublicNamePort, authCookie, authRelayCookie, domainUrl); tunnel = CreateAgentRedirect(meshserver, CreateRemoteTunnel(tunnelUpdate, options), serverPublicNamePort, authCookie, authRelayCookie, domainUrl);