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

1. modified os.platform() to return process.platform, for consistency

Browse Source 
2. updated os.name() on Windows to try to fetch name and id from registry
This commit is contained in:
Bryan Roe
2020-02-24 10:11:42 -08:00
parent f0c71884ef
commit ffcffafeb5
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
microscript/ILibDuktape_ScriptContainer.c
View File

@@ -1509,15 +1509,7 @@ duk_ret_t ILibDuktape_ScriptContainer_OS_arch(duk_context *ctx)
} }
duk_ret_t ILibDuktape_ScriptContainer_OS_platform(duk_context *ctx) duk_ret_t ILibDuktape_ScriptContainer_OS_platform(duk_context *ctx)
{ {
#ifdef WIN32 duk_eval_string(ctx, "process.platform");
duk_push_string(ctx, "win32");
#else
#ifdef __APPLE__
duk_push_string(ctx, "darwin");
#else
duk_push_string(ctx, "linux");
#endif
#endif
return 1; return 1;
} }
#ifndef WIN32 #ifndef WIN32
@@ -2154,7 +2146,17 @@ void ILibDuktape_ScriptContainer_OS_Push(duk_context *ctx, void *chain)
switch (process.platform)\ switch (process.platform)\
{\ {\
case 'win32':\ case 'win32':\
this.promise._acc(this.stdout.str.split('\\r\\n')[0]);\ var winstr = this.stdout.str.split('\\r\\n')[0];\
if(require('user-sessions').isRoot())\
{\
try\
{\
winstr = require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion', 'ProductName') + ' - ' +\
require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion', 'ReleaseID') + ' ' + winstr.substring(winstr.indexOf('['));\
}\
catch(xx) {}\
}\
this.promise._acc(winstr);\
break;\ break;\
case 'linux':\ case 'linux':\
lines = this.stdout.str.split('\\n');\ lines = this.stdout.str.split('\\n');\