MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-24 22:25:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #919 from TotallyNotElite/master

Browse Source 
Fix issues with linux/macos terminal
This commit is contained in:
Ylian Saint-Hilaire 2020-02-05 14:57:26 -08:00 committed by GitHub
commit 5b43925b05
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agents/meshcore.js
View File

@ -1240,7 +1240,7 @@ function createMeshCore(agent) {
var sh = fs.existsSync('/bin/sh') ? '/bin/sh' : false; var sh = fs.existsSync('/bin/sh') ? '/bin/sh' : false;
var login = process.platform == 'linux' ? '/bin/login' : '/usr/bin/login'; var login = process.platform == 'linux' ? '/bin/login' : '/usr/bin/login';
var env = { HISTCONTROL: 'ignoreboth', TERM: 'xterm' }; var env = { HISTCONTROL: 'ignoreboth' };
if (this.httprequest.xoptions) if (this.httprequest.xoptions)
{ {
if (this.httprequest.xoptions.rows) { env.LINES = ('' + this.httprequest.xoptions.rows); } if (this.httprequest.xoptions.rows) { env.LINES = ('' + this.httprequest.xoptions.rows); }

4
public/scripts/amt-terminal-0.0.2.js
View File

@ -73,7 +73,7 @@ var CreateAmtRemoteTerminal = function (divid, options) {
} }
obj.xxStateChange = function (newstate) { obj.xxStateChange = function (newstate) {
//if ((newstate == 3) && (options != null) && (options.xterm == true)) { obj.TermSendKeys(' stty rows ' + obj.height + ' cols ' + obj.width + '\n clear\n'); } //if ((newstate == 3) && (options != null) && (options.xterm == true)) { obj.TermSendKeys(' stty rows ' + obj.height + ' cols ' + obj.width + ';clear\n'); }
} }
obj.ProcessData = function (str) { obj.ProcessData = function (str) {
@ -805,6 +805,6 @@ var CreateAmtRemoteTerminal = function (divid, options) {
obj.heightLock = 0; obj.heightLock = 0;
obj.DivElement.style['height'] = ''; obj.DivElement.style['height'] = '';
if ((options != null) && (options.width != null) && (options.height != null)) { obj.Init(options.width, options.height); } else { obj.Init(); } if ((options != null) && (options.cols != null) && (options.rows != null)) { obj.Init(options.cols, options.rows); } else { obj.Init(); }
return obj; return obj;
} }

6
views/default.handlebars
View File

@ -6350,11 +6350,11 @@
var termoptions = { protocol: ((options != null) && (typeof options.protocol == 'number'))?options.protocol:1 }; var termoptions = { protocol: ((options != null) && (typeof options.protocol == 'number'))?options.protocol:1 };
if (options && options.requireLogin) { termoptions.requireLogin = true; } if (options && options.requireLogin) { termoptions.requireLogin = true; }
if ([1, 2, 3, 4, 21, 22].indexOf(currentNode.agent.id) == -1) { if ([1, 2, 3, 4, 21, 22].indexOf(currentNode.agent.id) == -1) {
if (Q('termSizeList').value == 2) { termoptions.width = 100; termoptions.height = 30; termoptions.xterm = true; } if (Q('termSizeList').value == 2) { termoptions.cols = 100; termoptions.rows = 30; termoptions.xterm = true; }
if (Q('termSizeList').value == 3) { if (Q('termSizeList').value == 3) {
// TODO: Try to improve terminal auto-size. // TODO: Try to improve terminal auto-size.
termoptions.width = Math.floor((Q('column_l').clientWidth - 60) / 10); termoptions.cols = Math.floor((Q('column_l').clientWidth - 60) / 10);
termoptions.height = Math.floor((Q('column_l').clientHeight - 120) / 20); termoptions.rows = Math.floor((Q('column_l').clientHeight - 120) / 20);
termoptions.xterm = true; termoptions.xterm = true;
} }
} }