MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-04 17:43:45 +00:00
Code Issues Releases Wiki Activity

updated when osversion is called

Browse Source
This commit is contained in:
Bryan Roe
2019-05-24 15:30:19 -07:00
parent 134f34d9cf
commit 792ab99f06
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/message-box.js
View File

@@ -376,6 +376,7 @@ function macos_messageBox()
this._messageServer = require('net').createServer();
this._messageServer.uid = require('user-sessions').consoleUid();
this._messageServer.osversion = require('service-manager').getOSVersion();
this._messageServer._options = options;
this._messageServer.timer = setTimeout(function (obj)
{
@@ -456,7 +457,6 @@ function macos_messageBox()
}
// Need to uninstall ourselves
var osVersion = require('service-manager').getOSVersion();
var s;
try
@@ -469,7 +469,7 @@ function macos_messageBox()
}
var child = require('child_process').execFile('/bin/sh', ['sh'], { detached: true });
if (osVersion.compareTo('10.10') < 0)
if (this.osversion.compareTo('10.10') < 0)
{
// Just unload
child.stdin.write('launchctl unload ' + s.plist + '\nrm ' + s.plist + '\nexit\n');
@@ -479,7 +479,13 @@ function macos_messageBox()
// Use bootout
child.stdin.write('launchctl bootout gui/' + this.uid + ' ' + s.plist + '\nrm ' + s.plist + '\nexit\n');
}
child.waitExit();
try
{
child.waitExit();
}
catch(e)
{
}
});
return (this._messageServer);