From ef46eeb1bead8bad308ea660a1265699835cfa30 Mon Sep 17 00:00:00 2001
From: Justin SB <justin@fathomdb.com>
Date: Thu, 2 Oct 2014 22:30:04 -0700
Subject: [PATCH] Send y when installing android target, a few text tweaks

---
 tools/commands-cordova.js                      | 6 ++++--
 tools/cordova-scripts/ensure_android_bundle.sh | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/commands-cordova.js b/tools/commands-cordova.js
index 7de676daa1..0bfb15077a 100644
--- a/tools/commands-cordova.js
+++ b/tools/commands-cordova.js
@@ -1554,7 +1554,7 @@ _.extend(Android.prototype, {
   installTarget: function (target) {
     var self = this;
 
-    var out = self.runAndroidTool(['update', 'sdk', '-t', target, '--all', '-u']);
+    var out = self.runAndroidTool(['update', 'sdk', '-t', target, '--all', '-u'], { stdin: 'y\n' });
     return false;
   },
 
@@ -1900,7 +1900,9 @@ main.registerCommand({
     } else {
       Console.info(Console.fail("Suitable Android API libraries not found"));
 
-      android.installTarget('sys-img-x86-android-19');
+      buildmessage.enterJob({ title: 'Installing Android API library'}, function () {
+        android.installTarget('sys-img-x86-android-19');
+      });
     }
 
     var avdName = 'meteor';
diff --git a/tools/cordova-scripts/ensure_android_bundle.sh b/tools/cordova-scripts/ensure_android_bundle.sh
index 93312bd75d..22312b0bbb 100755
--- a/tools/cordova-scripts/ensure_android_bundle.sh
+++ b/tools/cordova-scripts/ensure_android_bundle.sh
@@ -20,6 +20,7 @@ source "$(dirname "$0")/common_env.sh"
 cd "$ORIG_DIR"
 
 install_android_bundle () {
+  echo ""
   echo "Installing Android development bundle."
   echo "This might take a while, please hold on."