mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

versions() bug fix macOS

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2018-12-28 23:05:02 +01:00
parent addc8a5655
commit 964b82b893
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -100,6 +100,7 @@ Other changes
| Version | Date | Comment | | Version | Date | Comment |
| -------------- | -------------- | -------- | | -------------- | -------------- | -------- |
| 3.52.6 | 2018-12-28 | `versions()` bug fix macOS |
| 3.52.5 | 2018-12-28 | preparing automated tests, travis-ci integration, added dev-dependencies | | 3.52.5 | 2018-12-28 | preparing automated tests, travis-ci integration, added dev-dependencies |
| 3.52.4 | 2018-12-27 | `graphics().controllers` bugfix linux | | 3.52.4 | 2018-12-27 | `graphics().controllers` bugfix linux |
| 3.52.3 | 2018-12-27 | `os().codepage` bugfix | | 3.52.3 | 2018-12-27 | `os().codepage` bugfix |

18
lib/osinfo.js
View File

@ -367,7 +367,7 @@ function versions(callback) {
functionProcessed(); functionProcessed();
}); });
if (_darwin) { if (_darwin) {
const filename = '/Library/Developer/CommandLineTools/'; let filename = '/Library/Developer/CommandLineTools/';
fs.access(filename, fs.constants.F_OK, (err) => { fs.access(filename, fs.constants.F_OK, (err) => {
if (!err) { if (!err) {
exec('git --version', function (error, stdout) { exec('git --version', function (error, stdout) {
@ -378,6 +378,22 @@ function versions(callback) {
} }
functionProcessed(); functionProcessed();
}); });
} else {
let filename = '/usr/local/Cellar/git';
fs.access(filename, fs.constants.F_OK, (err) => {
if (!err) {
exec('git --version', function (error, stdout) {
if (!error) {
let git = stdout.toString().split('\n')[0] || '';
git = (git.toLowerCase().split('version')[1] || '').trim();
result.git = (git.split(' ')[0] || '').trim();
}
functionProcessed();
});
} else {
functionProcessed();
}
});
} }
}); });
} else { } else {