cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bra...@apache.org
Subject android commit: CB-5117: Output confirmation message if check_reqs passes.
Date Fri, 18 Oct 2013 18:23:01 GMT
Updated Branches:
  refs/heads/master b57317bdc -> 5ab11edad


CB-5117: Output confirmation message if check_reqs passes.


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/5ab11eda
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/5ab11eda
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/5ab11eda

Branch: refs/heads/master
Commit: 5ab11edad230980379282c5a6b83eec12f7b1c5b
Parents: b57317b
Author: mbillau <mike.billau@gmail.com>
Authored: Fri Oct 18 09:59:42 2013 -0400
Committer: Braden Shepherdson <braden.shepherdson@gmail.com>
Committed: Fri Oct 18 14:22:27 2013 -0400

----------------------------------------------------------------------
 bin/lib/check_reqs.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5ab11eda/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 80f88a8..f4def79 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -52,8 +52,8 @@ module.exports.check_ant = function() {
 module.exports.check_java = function() {
     if(process.env.JAVA_HOME) {
         var d = Q.defer();
-        child_process.exec('java', 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.'));
+        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.' + err));
             else d.resolve();
         });
         return d.promise;
@@ -87,5 +87,8 @@ module.exports.check_android = function() {
 
 // Returns a promise.
 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!');
+    });
 }
+


Mime
View raw message