MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-11-09 05:34:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated agent-update ARCHID detection on macOS to workaround bug in specific older versions

Browse Source
This commit is contained in:
Bryan Roe
2021-01-16 14:33:06 -08:00
parent 10f1b77006
commit 0a44d8c873
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
agents/meshcore.js
View File

@@ -53,8 +53,15 @@ if (require('MeshAgent').ARCHID == null)
id = require('_GenericMarshal').PointerSize == 4 ? 31 : 30; id = require('_GenericMarshal').PointerSize == 4 ? 31 : 30;
break; break;
case 'darwin': case 'darwin':
id = require('os').arch() == 'x64' ? 16 : 29; try
break; {
id = require('os').arch() == 'x64' ? 16 : 29;
}
catch (xx)
{
id = 16;
}
break; break;
} }
if (id != null) { Object.defineProperty(require('MeshAgent'), 'ARCHID', { value: id }); } if (id != null) { Object.defineProperty(require('MeshAgent'), 'ARCHID', { value: id }); }
} }

9
agents/recoverycore.js
View File

@@ -18,7 +18,14 @@ if (require('MeshAgent').ARCHID == null)
id = require('_GenericMarshal').PointerSize == 4 ? 31 : 30; id = require('_GenericMarshal').PointerSize == 4 ? 31 : 30;
break; break;
case 'darwin': case 'darwin':
id = require('os').arch() == 'x64' ? 16 : 29; try
{
id = require('os').arch() == 'x64' ? 16 : 29;
}
catch(xx)
{
id = 16;
}
break; break;
} }
if (id != null) { Object.defineProperty(require('MeshAgent'), 'ARCHID', { value: id }); } if (id != null) { Object.defineProperty(require('MeshAgent'), 'ARCHID', { value: id }); }