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

Updated metadata for toaster and message-box

Browse Source
This commit is contained in:
Bryan Roe
2020-05-29 16:24:17 -07:00
parent fdf86827ed
commit 4c143c948b
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

4
modules/message-box.js
View File

@@ -320,6 +320,7 @@ function linux_messageBox()
c.kill();
}, timeout * 1000, ret.child);
}
ret.child.descriptorMetadata = 'zenity, message-box'
ret.child.promise = ret;
ret.child.stderr.on('data', function (chunk) { });
ret.child.stdout.on('data', function (chunk) { });
@@ -354,6 +355,7 @@ function linux_messageBox()
ret.child = require('child_process').execFile(this.kdialog.path, ['kdialog', '--title', title, layout == null ? '--yesno' : '--msgbox', caption], { uid: uid, env: { DISPLAY: xinfo.display, XAUTHORITY: xinfo.xauthority, XDG_RUNTIME_DIR: xdg } });
ret.child.promise = ret;
}
ret.child.descriptorMetadata = 'kdialog, message-box'
ret.child.timeout = setTimeout(function (c)
{
c.timeout = null;
@@ -391,7 +393,7 @@ function linux_messageBox()
ret.child = require('child_process').execFile(this.xmessage.path, ['xmessage', '-center', '-buttons', layout == null ? 'No:1,Yes:2' : 'OK:2', '-timeout', timeout.toString(), '-default', layout==null?'No':'OK', '-title', title, caption], { uid: uid, env: { XAUTHORITY: xinfo.xauthority ? xinfo.xauthority : "", DISPLAY: xinfo.display } });
ret.child.stdout.on('data', function (c) { });
ret.child.stderr.on('data', function (c) { });
ret.child.descriptorMetadata = 'xmessage, message-box'
ret.child.promise = ret;
ret.child.on('exit', function (code)
{

7
modules/toaster.js
View File

@@ -77,6 +77,7 @@ function Toaster()
}
retVal.child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['powershell', '-noprofile', '-nologo', '-command', '-'], retVal.options);
retVal.child.descriptorMetadata = 'toaster';
retVal.child.toast = retVal;
retVal.child.stdout.stdin = retVal.child.stdin;
retVal.child.stderr.stdin = retVal.child.stdin;
@@ -133,7 +134,7 @@ function Toaster()
retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
retVal.child.timeout = setTimeout(function (c) { c.timeout = null; c.kill(); }, 5000, retVal.child);
}
retVal.child.descriptorMetadata = 'toaster (zenity/messagebox)'
}
else if (require('message-box').zenity.version[0] < 3 || (require('message-box').zenity.version[0] == 3 && require('message-box').zenity.version[1] < 10))
{
@@ -152,6 +153,7 @@ function Toaster()
// We're a regular user, so we don't need to do anything special
retVal.child = require('child_process').execFile(require('message-box').notifysend.path, ['notify-send', retVal.title, retVal.caption]);
}
retVal.child.descriptorMetadata = 'toaster (notify-send)'
}
else
{
@@ -167,12 +169,14 @@ function Toaster()
retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
retVal.child.timeout = setTimeout(function (c) { c.timeout = null; c.kill(); }, 5000, retVal.child);
}
retVal.child.descriptorMetadata = 'toaster (zenity/messagebox)'
}
}
else
{
// Use ZENITY Notification
retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--notification', '--title=' + title, '--text=' + caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
retVal.child.descriptorMetadata = 'toaster (zenity/notification)'
}
retVal.child.parent = retVal;
retVal.child.stderr.str = '';
@@ -198,6 +202,7 @@ function Toaster()
}
retVal._notify = require('child_process').execFile(util, ['kdialog', '--title', retVal.title, '--passivepopup', retVal.caption, '5'], { uid: retVal.consoleUid, env: { DISPLAY: retVal.xinfo.display, XAUTHORITY: retVal.xinfo.xauthority, XDG_RUNTIME_DIR: xdg } });
retVal._notify.descriptorMetadata = 'toaster (kdialog)'
retVal._notify.parent = retVal;
retVal._notify.stdout.on('data', function (chunk) { });
retVal._notify.stderr.on('data', function (chunk) { });