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

1. Updated MacOS, so detached child process uses fork instead of vfork

Browse Source 
2. Updated detached to be a bitmask on the type
3. Updated MacOS message-box cleanup
This commit is contained in:
Bryan Roe
2019-06-04 13:06:17 -07:00
parent 3ab7316172
commit f15c11c845
5 changed files with 45 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
modules/message-box.js
View File

@@ -398,39 +398,8 @@ function macos_messageBox()
this.client.uninstall = function ()
{
// Need to uninstall ourselves
console.log('uninstall');
var s;
try
{
s = require('service-manager').manager.getLaunchAgent(this._options.service);
}
catch (ee)
{
console.log('LaunchAgent not found');
return; // Nothing to do if the service doesn't exist
}
var child = require('child_process').execFile('/bin/sh', ['sh'], { detached: true });
if (this._options.osversion.compareTo('10.10') < 0)
{
// Just unload
console.log('launchctl unload ' + s.plist + '\nrm ' + s.plist + '\nexit\n');
child.stdin.write('launchctl unload ' + s.plist + '\nrm ' + s.plist + '\nexit\n');
}
else
{
// Use bootout
console.log('launchctl bootout gui/' + this._options.uid + ' ' + s.plist + '\nrm ' + s.plist + '\nexit\n');
child.stdin.write('launchctl bootout gui/' + this._options.uid + ' ' + s.plist + '\nrm ' + s.plist + '\nexit\n');
}
try
{
child.waitExit();
}
catch (e)
{
}
var child = require('child_process').execFile(process.execPath, [process.execPath.split('/').pop(), '-exec', "var s=require('service-manager').manager.getLaunchAgent('" + this._options.service + "', " + this._options.uid + "); s.unload(); require('fs').unlinkSync(s.plist);process.exit();"], { detached: true, type: require('child_process').SpawnTypes.DETACHED });
child.waitExit();
};
return (this.client);
};
@@ -460,10 +429,10 @@ function macos_messageBox()
require('service-manager').manager.installLaunchAgent(
{
name: options.tmpServiceName, servicePath: process.execPath, startType: 'AUTO_START',
name: options.tmpServiceName, servicePath: process.execPath, startType: 'AUTO_START', uid: ret.uid,
sessionTypes: ['Aqua'], parameters: ['-exec', "require('message-box').startClient({ path: '" + options.path + "', service: '" + options.tmpServiceName + "' }).on('end', function () { process.exit(); }).on('error', function () { process.exit(); });"]
});
require('service-manager').manager.getLaunchAgent(options.tmpServiceName).load(options.uid);
require('service-manager').manager.getLaunchAgent(options.tmpServiceName, ret.uid).load();
return (ret);
};