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

Fixed MeshCore.js for XTerm.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-01-28 15:59:54 -08:00
parent ce156052ca
commit b609e1fc91
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
agents/meshcore.js
View File

@ -1230,19 +1230,6 @@ 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;
<<<<<<< HEAD
/*
try {
if (require('linux-gnome-helpers').scriptVersion) {
if (require('linux-gnome-helpers').scriptVersion.major > 2 ||
(require('linux-gnome-helpers').scriptVersion.major == 2 && require('linux-gnome-helpers').scriptVersion.minor >= 25)) {
script = '/usr/bin/script';
}
}
} catch (ex) { }
*/
var python = false; //fs.existsSync('/usr/bin/python') ? '/usr/bin/python' : false;
=======
if (this.httprequest.xoptions.script) if (this.httprequest.xoptions.script)
{ {
try try
@ -1258,7 +1245,6 @@ function createMeshCore(agent) {
} catch (ex) { } } catch (ex) { }
} }
var python = (this.httprequest.xoptions.python && fs.existsSync('/usr/bin/python')) ? '/usr/bin/python' : false; var python = (this.httprequest.xoptions.python && fs.existsSync('/usr/bin/python')) ? '/usr/bin/python' : false;
>>>>>>> d44a88113778814efbc291357c3fe6cf1330bca5
var shell = bash || sh; var shell = bash || sh;
var env = { HISTCONTROL: 'ignoreboth', TERM: 'xterm' }; var env = { HISTCONTROL: 'ignoreboth', TERM: 'xterm' };