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

Updated os.arch() on macOS to differentiate Apple and Intel Silicon when running under Rosetta

Browse Source
This commit is contained in:
Bryan Roe
2021-08-26 16:40:35 -07:00
parent 3ce29c05b4
commit 670ffc1838
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
microscript/ILibDuktape_ScriptContainer.c
View File

@@ -2049,7 +2049,10 @@ void ILibDuktape_ScriptContainer_OS_Push(duk_context *ctx, void *chain)
#endif
ILibDuktape_CreateReadonlyProperty(ctx, "EOL");
#ifndef __APPLE__
ILibDuktape_CreateInstanceMethod(ctx, "arch", ILibDuktape_ScriptContainer_OS_arch, 0);
#endif
ILibDuktape_CreateInstanceMethod(ctx, "platform", ILibDuktape_ScriptContainer_OS_platform, 0);
ILibDuktape_CreateInstanceMethod(ctx, "endianness", ILibDuktape_ScriptContainer_OS_endianness, 0);
#if !defined(__APPLE__) && !defined(_FREEBSD)
@@ -2094,6 +2097,18 @@ void ILibDuktape_ScriptContainer_OS_Push(duk_context *ctx, void *chain)
return ('');\
}\
};\
if(process.platform == 'darwin')\
{\
exports.arch = function arch()\
{\
var child = require('child_process').execFile('/bin/sh', ['sh']);\
child.stdout.str = ''; child.stdout.on('data', function(c) { this.str += c.toString(); });\
child.stderr.str = ''; child.stderr.on('data', function(c) { this.str += c.toString(); });\
child.stdin.write(\"sysctl -a | grep brand_string | awk -F: '{ split($2,tok,\\\" \\\"); if(tok[1]==\\\"Apple\\\" || tok[1]==\\\"VirtualApple\\\") { print \\\"arm64\\\"; } else { print \\\"x64\\\"; } }'\\nexit\\n\");\
child.waitExit();\
return(child.stdout.str.trim());\
};\
}\
if(process.platform == 'linux')\
{\
Object.defineProperty(exports, '_longbit', {value: (function ()\