diff --git a/CHANGELOG.md b/CHANGELOG.md index 876afe8..1eb2c12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page. | Version | Date | Comment | | -------------- | -------------- | -------- | +| 4.2.0 | 2019-05-09 | `osInfo()` extended service pack version (windows) | | 4.1.8 | 2019-05-09 | `graphics()` resolve on error (windows) | | 4.1.7 | 2019-05-09 | `users()` parsing fix (windows) | | 4.1.6 | 2019-04-24 | `memory()` swap used fix (linux) | diff --git a/README.md b/README.md index a11372c..ea1dd31 100644 --- a/README.md +++ b/README.md @@ -276,6 +276,7 @@ I also created a nice little command line tool called [mmon][mmon-github-url] ( | | logofile | X | X | X | X | X | e.g. 'apple', 'debian', 'fedora', ... | | | serial | X | X | X | X | | OS/Host serial number | | | build | X | | X | X | | OS build version | +| | servicepack | | | | X | | service pack version | | si.uuid(cb) | {...} | X | X | X | X | X | object of several UUIDs | | | os | X | X | X | X | | os specific UUID | | si.versions(cb) | {...} | X | X | X | X | X | version information (kernel, ssl, node, ...) | diff --git a/docs/history.html b/docs/history.html index 597becc..187f0b3 100644 --- a/docs/history.html +++ b/docs/history.html @@ -80,6 +80,11 @@ + + 4.2.0 + 2019-05-09 + osInfo() extended service pack version (windows) + 4.1.8 2019-05-09 diff --git a/docs/index.html b/docs/index.html index 5511e38..d782e5e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
-
Current Version: 4.1.8
+
Current Version: 4.2.0
diff --git a/docs/os.html b/docs/os.html index 3e21079..1df7358 100644 --- a/docs/os.html +++ b/docs/os.html @@ -185,6 +185,16 @@ OS build version + + + servicepack + + + + X + + service pack version + si.uuid(cb) {...} diff --git a/lib/osinfo.js b/lib/osinfo.js index 2c0c3ad..a68b627 100644 --- a/lib/osinfo.js +++ b/lib/osinfo.js @@ -175,7 +175,8 @@ function osInfo(callback) { codepage: '', logofile: '', serial: '', - build: '' + build: '', + servicepack: '' }; if (_linux) { @@ -286,6 +287,7 @@ function osInfo(callback) { result.distro = util.getValue(lines, 'Caption', '=').trim(); result.serial = util.getValue(lines, 'SerialNumber', '=').trim(); result.build = util.getValue(lines, 'BuildNumber', '=').trim(); + result.servicepack = util.getValue(lines, 'ServicePackMajorVersion', '=').trim() + '.' + util.getValue(lines, 'ServicePackMinorVersion', '=').trim(); result.codepage = util.getCodepage(); if (callback) { callback(result);