You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2012/06/29 02:08:55 UTC
[1/3] android commit: CB-937 fixing debug
Updated Branches:
refs/heads/master e2047afa4 -> 17ff6be6a
CB-937 fixing debug
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/17ff6be6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/17ff6be6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/17ff6be6
Branch: refs/heads/master
Commit: 17ff6be6a90b106cf383a80063ea25e8f28d8062
Parents: d42489c
Author: Anis Kadri <an...@gmail.com>
Authored: Thu Jun 28 17:08:32 2012 -0700
Committer: Anis Kadri <an...@gmail.com>
Committed: Thu Jun 28 17:08:32 2012 -0700
----------------------------------------------------------------------
bin/templates/cordova/cordova | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/17ff6be6/bin/templates/cordova/cordova
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/cordova b/bin/templates/cordova/cordova
index 0f3e452..0bca03f 100755
--- a/bin/templates/cordova/cordova
+++ b/bin/templates/cordova/cordova
@@ -61,12 +61,15 @@ function log {
adb logcat
}
-function debug_install {
- ant debug install
-}
-
function debug {
- ant debug
+ if [ $(check_devices) == 0 ] ; then
+ ant debug install
+ else
+ ant debug
+ echo "##################################################################"
+ echo "# Plug in your device or launch an emulator with cordova/emulate #"
+ echo "##################################################################"
+ fi
}
function launch {
@@ -75,16 +78,7 @@ function launch {
}
function BOOM {
- clean
- if [ $(check_devices) == 0 ] ; then
- debug_install && launch
- return
- else
- debug
- echo "##################################################################"
- echo "# Plug in your device or launch an emulator with cordova/emulate #"
- echo "##################################################################"
- fi
+ clean && debug && launch
}
# TODO parse arguments