MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-29 15:35:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-08-12 10:32:11 -07:00
commit 889c2536fd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agents/meshcore.js
View File

@ -1949,7 +1949,10 @@ function onTunnelData(data) {
var login = process.platform == 'linux' ? '/bin/login' : '/usr/bin/login'; var login = process.platform == 'linux' ? '/bin/login' : '/usr/bin/login';
var env = { HISTCONTROL: 'ignoreboth' }; var env = { HISTCONTROL: 'ignoreboth' };
if (this.httprequest.xoptions) { if (process.env['LANG']) { env['LANG'] = process.env['LANG']; }
if (process.env['PATH']) { env['PATH'] = process.env['PATH']; }
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); }
if (this.httprequest.xoptions.cols) { env.COLUMNS = ('' + this.httprequest.xoptions.cols); } if (this.httprequest.xoptions.cols) { env.COLUMNS = ('' + this.httprequest.xoptions.cols); }
} }

5
agents/recoverycore.js
View File

@ -979,7 +979,10 @@ require('MeshAgent').AddCommandHandler(function (data) {
} }
else { else {
var env = { HISTCONTROL: 'ignoreboth' }; var env = { HISTCONTROL: 'ignoreboth' };
if (this.httprequest.xoptions) { if (process.env['LANG']) { env['LANG'] = process.env['LANG']; }
if (process.env['PATH']) { env['PATH'] = process.env['PATH']; }
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); }
if (this.httprequest.xoptions.cols) { env.COLUMNS = ('' + this.httprequest.xoptions.cols); } if (this.httprequest.xoptions.cols) { env.COLUMNS = ('' + this.httprequest.xoptions.cols); }
} }