MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-12 06:13:43 +00:00
Code Issues Releases Wiki Activity

Added freebsd support for clipboard via xclip

Browse Source
This commit is contained in:
Bryan Roe
2020-06-03 21:15:25 -07:00
parent 44b44a2456
commit 82f7091156
2 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

51
modules/clipboard.js
View File

@@ -74,7 +74,7 @@ function dispatchRead(sid)
id = sid; id = sid;
} }
if (id == 0 || process.platform == 'darwin' || (process.platform == 'linux' && require('clipboard').xclip)) if (id == 0 || process.platform == 'darwin' || process.platform == 'freebsd' || (process.platform == 'linux' && require('clipboard').xclip))
{ {
return (module.exports.read()); return (module.exports.read());
} }
@@ -134,7 +134,7 @@ function dispatchWrite(data, sid)
id = sid; id = sid;
} }
if (id == 0 || process.platform == 'darwin' || (process.platform == 'linux' && require('clipboard').xclip)) if (id == 0 || process.platform == 'darwin' || process.platform == 'freebsd' || (process.platform == 'linux' && require('clipboard').xclip))
{ {
return(module.exports(data)); return(module.exports(data));
} }
@@ -207,6 +207,12 @@ function lin_xclip_readtext(ret)
return (ret); return (ret);
} }
function bsd_xclip_readtext()
{
var ret = new promise(function (res, rej) { this._res = res; this._rej = rej; });
lin_xclip_readtext(ret);
return (ret);
}
function lin_readtext() function lin_readtext()
{ {
@@ -504,16 +510,39 @@ switch(process.platform)
case 'linux': case 'linux':
module.exports = lin_copytext; module.exports = lin_copytext;
module.exports.read = lin_readtext; module.exports.read = lin_readtext;
Object.defineProperty(module.exports, "xclip", { Object.defineProperty(module.exports, "xclip",
value: (function ()
{ {
var child = require('child_process').execFile('/bin/sh', ['sh']); get: function ()
child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); }); {
child.stdin.write("whereis xclip | awk '{ print $2; }'\nexit\n"); if (this._xclip) { return (this._xclip); }
child.waitExit(); var child = require('child_process').execFile('/bin/sh', ['sh']);
return (child.stdout.str.trim() != "" ? child.stdout.str.trim() : null); child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
})() child.stdin.write("whereis xclip | awk '{ print $2; }'\nexit\n");
}); child.waitExit();
if (child.stdout.str.trim() != "")
{
Object.defineProperty(this, "_xclip", { value: child.stdout.str.trim() });
}
return (child.stdout.str.trim() != "" ? child.stdout.str.trim() : null);
}
});
break;
case 'freebsd':
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
child.stdin.write("whereis xclip | awk '{ print $2; }'\nexit\n");
child.waitExit();
if (child.stdout.str.trim() != "")
{
module.exports = lin_xclip_copy;
module.exports.read = bsd_xclip_readtext;
Object.defineProperty(module.exports, "xclip", { value: child.stdout.str.trim() });
}
else
{
throw ('Clipboard Support on BSD requires xclip');
}
break; break;
case 'darwin': case 'darwin':
module.exports = macos_copytext; module.exports = macos_copytext;