cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dase...@apache.org
Subject android commit: CB-10669 cordova run --list cannot find 'adb'
Date Mon, 29 Feb 2016 07:01:59 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master 0a1b71f12 -> aa2b3d3da


CB-10669 cordova run --list cannot find 'adb'


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

Branch: refs/heads/master
Commit: aa2b3d3da1f2471ec1211ef82082c3c9cd399272
Parents: 0a1b71f
Author: daserge <v-seshak@microsoft.com>
Authored: Fri Feb 26 13:14:42 2016 +0300
Committer: daserge <v-seshak@microsoft.com>
Committed: Fri Feb 26 13:29:26 2016 +0300

----------------------------------------------------------------------
 bin/templates/cordova/lib/list-devices           | 15 ++++++++-------
 bin/templates/cordova/lib/list-emulator-images   | 14 ++++++++------
 bin/templates/cordova/lib/list-started-emulators | 14 ++++++++------
 3 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/aa2b3d3d/bin/templates/cordova/lib/list-devices
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/list-devices b/bin/templates/cordova/lib/list-devices
index e390bff..fa84d7f 100755
--- a/bin/templates/cordova/lib/list-devices
+++ b/bin/templates/cordova/lib/list-devices
@@ -22,12 +22,13 @@
 var devices = require('./device');
 
 // Usage support for when args are given
-devices.list().done(function(device_list) {
-    device_list && device_list.forEach(function(dev) {
-        console.log(dev);
+require('../lib/check_reqs').check_android().then(function() {
+    devices.list().done(function(device_list) {
+        device_list && device_list.forEach(function(dev) {
+            console.log(dev);
+        });
+    }, function(err) {
+        console.error('ERROR: ' + err);
+        process.exit(2);
     });
-}, function(err) {
-    console.error('ERROR: ' + err);
-    process.exit(2);
 });
-

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/aa2b3d3d/bin/templates/cordova/lib/list-emulator-images
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/list-emulator-images b/bin/templates/cordova/lib/list-emulator-images
index 996cf55..03c827f 100755
--- a/bin/templates/cordova/lib/list-emulator-images
+++ b/bin/templates/cordova/lib/list-emulator-images
@@ -22,11 +22,13 @@
 var emulators = require('./emulator');
 
 // Usage support for when args are given
-emulators.list_images().done(function(emulator_list) {
-    emulator_list && emulator_list.forEach(function(emu) {
-        console.log(emu.name);
+require('../lib/check_reqs').check_android().then(function() {
+    emulators.list_images().done(function(emulator_list) {
+        emulator_list && emulator_list.forEach(function(emu) {
+            console.log(emu.name);
+        });
+    }, function(err) {
+        console.error('ERROR: ' + err);
+        process.exit(2);
     });
-}, function(err) {
-    console.error('ERROR: ' + err);
-    process.exit(2);
 });

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/aa2b3d3d/bin/templates/cordova/lib/list-started-emulators
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/list-started-emulators b/bin/templates/cordova/lib/list-started-emulators
index 2ae8c5a..a890dec 100755
--- a/bin/templates/cordova/lib/list-started-emulators
+++ b/bin/templates/cordova/lib/list-started-emulators
@@ -22,11 +22,13 @@
 var emulators = require('./emulator');
 
 // Usage support for when args are given
-emulators.list_started().done(function(emulator_list) {
-    emulator_list && emulator_list.forEach(function(emu) {
-        console.log(emu);
+require('../lib/check_reqs').check_android().then(function() {
+    emulators.list_started().done(function(emulator_list) {
+        emulator_list && emulator_list.forEach(function(emu) {
+            console.log(emu);
+        });
+    }, function(err) {
+        console.error('ERROR: ' + err);
+        process.exit(2);
     });
-}, function(err) {
-    console.error('ERROR: ' + err);
-    process.exit(2);
 });


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message