versions() - bugfix git version macOS

This commit is contained in:
Sebastian Hildebrandt
2018-07-03 23:06:12 +02:00
parent a5343b3db0
commit 161387cf02
3 changed files with 32 additions and 6 deletions
+30 -5
View File
@@ -15,6 +15,7 @@
const os = require('os');
const exec = require('child_process').exec;
const util = require('./util');
const fs = require('fs');
let _platform = process.platform;
@@ -251,10 +252,10 @@ function osInfo(callback) {
callback(result);
}
resolve(result);
});
});
} catch (e) {
if (callback) { callback(result); }
resolve(result);
resolve(result);
}
}
});
@@ -286,7 +287,7 @@ function versions(callback) {
};
let functionProcessed = (function () {
let totalFunctions = 12;
let totalFunctions = 13;
return function () {
if (--totalFunctions === 0) {
if (callback) {
@@ -337,6 +338,30 @@ function versions(callback) {
}
functionProcessed();
});
if (_darwin) {
const filename = '/Library/Developer/CommandLineTools/';
fs.access(filename, fs.constants.F_OK, (err) => {
if (!err) {
exec('git --version', function (error, stdout) {
if (!error) {
result.git = stdout.toString().split('\n')[0] || '';
result.git = (result.git.toLowerCase().split('version')[1] || '').trim();
result.git = (result.git.split(' ')[0] || '').trim();
}
functionProcessed();
});
}
});
} else {
exec('git --version', function (error, stdout) {
if (!error) {
result.git = stdout.toString().split('\n')[0] || '';
result.git = (result.git.toLowerCase().split('version')[1] || '').trim();
result.git = (result.git.split(' ')[0] || '').trim();
}
functionProcessed();
});
}
exec('git --version', function (error, stdout) {
if (!error) {
result.git = stdout.toString().split('\n')[0] || '';
@@ -386,10 +411,10 @@ function versions(callback) {
result.mongodb = (result.mongodb.toLowerCase().split(',')[0] || '').replace(/[^0-9.]/g, '');
}
functionProcessed();
});
});
} catch (e) {
if (callback) { callback(result); }
resolve(result);
resolve(result);
}
});
});