You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/06/14 23:48:27 UTC
android commit: correct refs to various lib scripts in run.
Updated Branches:
refs/heads/master 53cc381c7 -> 32d74f862
correct refs to various lib scripts in run.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/32d74f86
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/32d74f86
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/32d74f86
Branch: refs/heads/master
Commit: 32d74f8623209cc3d9c0bd57c0a8ce88a9df85b0
Parents: 53cc381
Author: Fil Maj <ma...@gmail.com>
Authored: Fri Jun 14 14:48:23 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Fri Jun 14 14:48:23 2013 -0700
----------------------------------------------------------------------
bin/templates/cordova/run | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/32d74f86/bin/templates/cordova/run
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/run b/bin/templates/cordova/run
index f47adca..d871c09 100755
--- a/bin/templates/cordova/run
+++ b/bin/templates/cordova/run
@@ -76,11 +76,11 @@ function wait_for_emulator {
if [[ "$#" -eq 2 ]] ; then
$DIR/build $2
if [[ $1 == "--device" ]] ; then
- $DIR/lib/install_device
+ $DIR/lib/install-device
elif [[ $1 == "--emulator" ]] ; then
- $DIR/lib/install_emulator
+ $DIR/lib/install-emulator
elif [[ $1 =~ "--target=" ]]; then
- $DIR/lib/install_device $1
+ $DIR/lib/install-device $1
else
echo "Error : '$1' is not recognized as an install option"
fi
@@ -89,13 +89,13 @@ elif [[ "$#" -eq 1 ]] ; then
$DIR/build $1
elif [[ $1 == "--device" ]] ; then
$DIR/build
- $DIR/lib/install_device
+ $DIR/lib/install-device
elif [[ $1 == "--emulator" ]] ; then
$DIR/build
- $DIR/lib/install_emulator
+ $DIR/lib/install-emulator
elif [[ $1 =~ "--target=" ]]; then
$DIR/build
- $DIR/lib/install_device $1
+ $DIR/lib/install-device $1
else
echo "Error : '$1' is not recognized as an install option"
fi
@@ -104,17 +104,17 @@ else
#$DIR/build
devices=$("$DIR/lib/list-devices")
if [ $? = 0 ]; then
- $DIR/lib/install_device
+ $DIR/lib/install-device
else
emulators=$("$DIR/lib/list-started-emulators")
if [ $? = 0 ] ; then
- $DIR/lib/install_emulator
+ $DIR/lib/install-emulator
else
images=$("$DIR/lib/list-emulator-images")
if [ $? = 0 ] ; then
$DIR/lib/start-emulator
wait_for_emulator
- $DIR/lib/install_emulator
+ $DIR/lib/install-emulator
else
echo "No Android devices attached, nor emulator images available to start. How are we supposed to do this, then?"
exit 2