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

This commit is contained in:
daserge 2016-02-26 13:14:42 +03:00
parent 0a1b71f125
commit aa2b3d3da1
3 changed files with 24 additions and 19 deletions

View File

@ -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);
});

View File

@ -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);
});

View File

@ -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);
});