Updated agent-update ARCHID detection on macOS to workaround bug in specific older versions
Bryan Roe committed
Jan 16, 2021 at 14:33 UTC
0a44d8c873c3ce29778390ddfab1828fd233e591
2 files changed
+17
-3
agents/meshcore.js
+9
-2
@@ -53,8 +53,15 @@ if (require('MeshAgent').ARCHID == null)
53
id = require('_GenericMarshal').PointerSize == 4 ? 31 : 30;
54
break;
55
case 'darwin':
56
- id = require('os').arch() == 'x64' ? 16 : 29;
57
- break;
56
+ try
57
+ {
58
+ id = require('os').arch() == 'x64' ? 16 : 29;
59
+ }
60
+ catch (xx)
61
+ {
62
+ id = 16;
63
+ }
64
+ break; break;
65
}
66
if (id != null) { Object.defineProperty(require('MeshAgent'), 'ARCHID', { value: id }); }
67
}
agents/recoverycore.js
+8
-1
@@ -18,7 +18,14 @@ if (require('MeshAgent').ARCHID == null)
18
id = require('_GenericMarshal').PointerSize == 4 ? 31 : 30;
19
break;
20
case 'darwin':
21
- id = require('os').arch() == 'x64' ? 16 : 29;
21
+ try
22
+ {
23
+ id = require('os').arch() == 'x64' ? 16 : 29;
24
+ }
25
+ catch(xx)
26
+ {
27
+ id = 16;
28
+ }
29
break;
30
}
31
if (id != null) { Object.defineProperty(require('MeshAgent'), 'ARCHID', { value: id }); }