Fixed MeshCore.js for XTerm.
Ylian Saint-Hilaire committed
Jan 28, 2020 at 15:59 UTC
b609e1fc919c1ee49d513f5d57221ae9db77a8c2
1 file changed
-14
agents/meshcore.js
-14
@@ -1230,19 +1230,6 @@ function createMeshCore(agent) {
1230
var bash = fs.existsSync('/bin/bash') ? '/bin/bash' : false;
1231
var sh = fs.existsSync('/bin/sh') ? '/bin/sh' : false;
1232
var script = false;
1233
-<<<<<<< HEAD
1234
- /*
1235
- try {
1236
- if (require('linux-gnome-helpers').scriptVersion) {
1237
- if (require('linux-gnome-helpers').scriptVersion.major > 2 ||
1238
- (require('linux-gnome-helpers').scriptVersion.major == 2 && require('linux-gnome-helpers').scriptVersion.minor >= 25)) {
1239
- script = '/usr/bin/script';
1240
- }
1241
- }
1242
- } catch (ex) { }
1243
- */
1244
- var python = false; //fs.existsSync('/usr/bin/python') ? '/usr/bin/python' : false;
1245
-=======
1233
if (this.httprequest.xoptions.script)
1234
{
1235
try
@@ -1258,7 +1245,6 @@ function createMeshCore(agent) {
1245
} catch (ex) { }
1246
}
1247
var python = (this.httprequest.xoptions.python && fs.existsSync('/usr/bin/python')) ? '/usr/bin/python' : false;
1261
->>>>>>> d44a88113778814efbc291357c3fe6cf1330bca5
1248
var shell = bash || sh;
1249
1250
var env = { HISTCONTROL: 'ignoreboth', TERM: 'xterm' };