systeminformation 5.23.23 → 5.23.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/osinfo.js +10 -1
- package/lib/system.js +7 -4
- package/package.json +1 -1
package/lib/osinfo.js
CHANGED
|
@@ -76,12 +76,15 @@ function getLogoFile(distro) {
|
|
|
76
76
|
if (_windows) {
|
|
77
77
|
result = 'windows';
|
|
78
78
|
}
|
|
79
|
-
else if (distro.indexOf('mac os') !== -1) {
|
|
79
|
+
else if (distro.indexOf('mac os') !== -1 || distro.indexOf('macos') !== -1) {
|
|
80
80
|
result = 'apple';
|
|
81
81
|
}
|
|
82
82
|
else if (distro.indexOf('arch') !== -1) {
|
|
83
83
|
result = 'arch';
|
|
84
84
|
}
|
|
85
|
+
else if (distro.indexOf('cachy') !== -1) {
|
|
86
|
+
result = 'cachy';
|
|
87
|
+
}
|
|
85
88
|
else if (distro.indexOf('centos') !== -1) {
|
|
86
89
|
result = 'centos';
|
|
87
90
|
}
|
|
@@ -97,6 +100,9 @@ function getLogoFile(distro) {
|
|
|
97
100
|
else if (distro.indexOf('elementary') !== -1) {
|
|
98
101
|
result = 'elementary';
|
|
99
102
|
}
|
|
103
|
+
else if (distro.indexOf('endeavour') !== -1) {
|
|
104
|
+
result = 'endeavour';
|
|
105
|
+
}
|
|
100
106
|
else if (distro.indexOf('fedora') !== -1) {
|
|
101
107
|
result = 'fedora';
|
|
102
108
|
}
|
|
@@ -133,6 +139,9 @@ function getLogoFile(distro) {
|
|
|
133
139
|
else if (distro.indexOf('puppy') !== -1) {
|
|
134
140
|
result = 'puppy';
|
|
135
141
|
}
|
|
142
|
+
else if (distro.indexOf('popos') !== -1) {
|
|
143
|
+
result = 'popos';
|
|
144
|
+
}
|
|
136
145
|
else if (distro.indexOf('raspbian') !== -1) {
|
|
137
146
|
result = 'raspbian';
|
|
138
147
|
}
|
package/lib/system.js
CHANGED
|
@@ -215,11 +215,14 @@ function system(callback) {
|
|
|
215
215
|
exec('ioreg -c IOPlatformExpertDevice -d 2', function (error, stdout) {
|
|
216
216
|
if (!error) {
|
|
217
217
|
let lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
|
|
218
|
-
|
|
219
|
-
const
|
|
218
|
+
|
|
219
|
+
const model = util.getAppleModel(util.getValue(lines, 'model', '=', true));
|
|
220
|
+
// const modelParts = util.splitByNumber(model);
|
|
221
|
+
// const version = util.getValue(lines, 'version', '=', true);
|
|
220
222
|
result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
|
|
221
|
-
result.model =
|
|
222
|
-
result.
|
|
223
|
+
result.model = model.key;
|
|
224
|
+
result.type = macOsChassisType(model.model);
|
|
225
|
+
result.version = model.version;
|
|
223
226
|
result.serial = util.getValue(lines, 'ioplatformserialnumber', '=', true);
|
|
224
227
|
result.uuid = util.getValue(lines, 'ioplatformuuid', '=', true).toLowerCase();
|
|
225
228
|
result.sku = util.getValue(lines, 'board-id', '=', true) || util.getValue(lines, 'target-sub-type', '=', true);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "systeminformation",
|
|
3
|
-
"version": "5.23.
|
|
3
|
+
"version": "5.23.25",
|
|
4
4
|
"description": "Advanced, lightweight system and OS information library",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
|