mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-22 00:32:55 +08:00
CB-5117: Output confirmation message if check_reqs passes.
This commit is contained in:
parent
b57317bdc2
commit
5ab11edad2
@ -52,8 +52,8 @@ module.exports.check_ant = function() {
|
|||||||
module.exports.check_java = function() {
|
module.exports.check_java = function() {
|
||||||
if(process.env.JAVA_HOME) {
|
if(process.env.JAVA_HOME) {
|
||||||
var d = Q.defer();
|
var d = Q.defer();
|
||||||
child_process.exec('java', function(err, stdout, stderr) {
|
child_process.exec('java -version', function(err, stdout, stderr) {
|
||||||
if(err) d.reject(new Error('ERROR : executing command \'java\', make sure you java environment is set up. Including your JDK and JRE.'));
|
if(err) d.reject(new Error('ERROR : executing command \'java\', make sure you java environment is set up. Including your JDK and JRE.' + err));
|
||||||
else d.resolve();
|
else d.resolve();
|
||||||
});
|
});
|
||||||
return d.promise;
|
return d.promise;
|
||||||
@ -87,5 +87,8 @@ module.exports.check_android = function() {
|
|||||||
|
|
||||||
// Returns a promise.
|
// Returns a promise.
|
||||||
module.exports.run = function() {
|
module.exports.run = function() {
|
||||||
return Q.all([this.check_ant(), this.check_java, this.check_android()]);
|
return Q.all([this.check_ant(), this.check_java(), this.check_android()]).then(function() {
|
||||||
|
console.log('Looks like your environment fully supports cordova-android development!');
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user