MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-14 23:33:38 +00:00
Code Issues Releases Wiki Activity

Added ability to abort new message-box for macOS, and updated metadata

Browse Source
This commit is contained in:
Bryan Roe
2020-06-12 10:24:39 -07:00
parent 5b1bf0f25c
commit c32d4e0914
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/message-box.js
View File

@@ -581,6 +581,7 @@ function macos_messageBox()
var icon = 'with icon caution';
ret.child = require('child_process').execFile('/bin/zsh', ['zsh'], { type: require('child_process').SpawnTypes.TERM });
ret.child.descriptorMetadata = 'message-box';
ret.child.promise = ret;
ret.child.stdout.str = ''; ret.child.stdout.on('data', function (c) { this.str += c.toString(); });
ret.child.on('exit', function ()
@@ -603,9 +604,14 @@ function macos_messageBox()
this.promise._rej('denied');
}
}
this.promise.child = null;
});
ret.child.stdin.write('su - ' + ret.name + '\n');
ret.child.stdin.write('osascript -e \'tell current application to display dialog "' + caption + '" with title "' + title + '" ' + icon + ' ' + buttons + timeout + '\' 2>/dev/null | awk \'{ c=split($0, tokens, ","); split(tokens[1], val, ":"); if(c==1) { print val[2] } else { split(tokens[2], gu, ":"); if(gu[2]=="true") { print "_TIMEOUT_" } else { print val[2] } } }\'\nexit\nexit\n');
ret.close = function close()
{
if (this.child) { this.child.kill(); }
};
return (ret);
}