systeminformation 5.10.1 → 5.10.2

package/README.md

@@ -982,6 +982,7 @@ Written by Sebastian Hildebrandt [sebhildebrandt](https://github.com/sebhildebra
 - Maria Camila Cubides [MariaCamilaCubides](https://github.com/MariaCamilaCubides)
 - Aleksander Krasnicki [plakak](https://github.com/plakak)
 - Alexis Tyler [OmgImAlexis](https://github.com/OmgImAlexis)
+- Simon Smith [si458](https://github.com/si458)
 
 OSX Temperature: credits here are going to:
 

package/lib/osinfo.js

@@ -1132,13 +1132,13 @@ echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;`;
         if (process.arch === 'ia32' && Object.prototype.hasOwnProperty.call(process.env, 'PROCESSOR_ARCHITEW6432')) {
           sysdir = '%windir%\\sysnative\\cmd.exe /c %windir%\\System32';
         }
-        exec(`${sysdir}\\reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid`, util.execOptsWin, function (error, stdout) {
-          parts = stdout.toString().split('\n\r')[0].split('REG_SZ');
-          result.os = parts.length > 1 ? parts[1].replace(/\r+|\n+|\s+/ig, '').toLowerCase() : '';
-          util.powerShell('Get-WmiObject Win32_ComputerSystemProduct | fl *').then((stdout) => {
-            // let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0)[0].trim().split(/\s\s+/);
-            let lines = stdout.split('\r\n');
-            result.hardware = util.getValue(lines, 'uuid', ':').toLowerCase();
+        util.powerShell('Get-WmiObject Win32_ComputerSystemProduct | fl *').then((stdout) => {
+          // let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0)[0].trim().split(/\s\s+/);
+          let lines = stdout.split('\r\n');
+          result.hardware = util.getValue(lines, 'uuid', ':').toLowerCase();
+          exec(`${sysdir}\\reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid`, util.execOptsWin, function (error, stdout) {
+            parts = stdout.toString().split('\n\r')[0].split('REG_SZ');
+            result.os = parts.length > 1 ? parts[1].replace(/\r+|\n+|\s+/ig, '').toLowerCase() : '';
             if (callback) {
               callback(result);
             }

package/lib/processes.js

@@ -324,7 +324,16 @@ function services(srv, callback) {
         }
         if (_windows) {
           try {
-            util.powerShell('Get-WmiObject Win32_Service | fl *').then((stdout, error) => {
+            let wincommand = "Get-WmiObject Win32_Service";
+            if (srvs[0] !== '*') {
+              wincommand += ' -Filter "';
+              for (let i = 0; i < srvs.length; i++) {
+                wincommand += `Name='${srvs[i]}' or `;
+              }
+              wincommand = `${wincommand.slice(0,-4)}"`;
+            }
+            wincommand += ' | fl *';
+            util.powerShell(wincommand).then((stdout, error) => {
               if (!error) {
                 let serviceSections = stdout.split(/\n\s*\n/);
                 for (let i = 0; i < serviceSections.length; i++) {
@@ -338,7 +347,7 @@ function services(srv, callback) {
                     if (srvString === '*' || srvs.indexOf(srvName) >= 0 || srvs.indexOf(srvCaption) >= 0) {
                       result.push({
                         name: srvName,
-                        running: (started === 'TRUE'),
+                        running: (started.toLowerCase() === 'true'),
                         startmode: startMode,
                         pids: [pid],
                         cpu: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.10.1",
+  "version": "5.10.2",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",