public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

correct refs to various lib scripts in run.

Browse Source
This commit is contained in:
Fil Maj 2013-06-14 14:48:23 -07:00
parent 53cc381c76
commit 32d74f8623
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/templates/cordova/run
View File

@ -76,11 +76,11 @@ function wait_for_emulator {
if [[ "$#" -eq 2 ]] ; then if [[ "$#" -eq 2 ]] ; then
$DIR/build $2 $DIR/build $2
if [[ $1 == "--device" ]] ; then if [[ $1 == "--device" ]] ; then
$DIR/lib/install_device $DIR/lib/install-device
elif [[ $1 == "--emulator" ]] ; then elif [[ $1 == "--emulator" ]] ; then
$DIR/lib/install_emulator $DIR/lib/install-emulator
elif [[ $1 =~ "--target=" ]]; then elif [[ $1 =~ "--target=" ]]; then
$DIR/lib/install_device $1 $DIR/lib/install-device $1
else else
echo "Error : '$1' is not recognized as an install option" echo "Error : '$1' is not recognized as an install option"
fi fi
@ -89,13 +89,13 @@ elif [[ "$#" -eq 1 ]] ; then
$DIR/build $1 $DIR/build $1
elif [[ $1 == "--device" ]] ; then elif [[ $1 == "--device" ]] ; then
$DIR/build $DIR/build
$DIR/lib/install_device $DIR/lib/install-device
elif [[ $1 == "--emulator" ]] ; then elif [[ $1 == "--emulator" ]] ; then
$DIR/build $DIR/build
$DIR/lib/install_emulator $DIR/lib/install-emulator
elif [[ $1 =~ "--target=" ]]; then elif [[ $1 =~ "--target=" ]]; then
$DIR/build $DIR/build
$DIR/lib/install_device $1 $DIR/lib/install-device $1
else else
echo "Error : '$1' is not recognized as an install option" echo "Error : '$1' is not recognized as an install option"
fi fi
@ -104,17 +104,17 @@ else
#$DIR/build #$DIR/build
devices=$("$DIR/lib/list-devices") devices=$("$DIR/lib/list-devices")
if [ $? = 0 ]; then if [ $? = 0 ]; then
$DIR/lib/install_device $DIR/lib/install-device
else else
emulators=$("$DIR/lib/list-started-emulators") emulators=$("$DIR/lib/list-started-emulators")
if [ $? = 0 ] ; then if [ $? = 0 ] ; then
$DIR/lib/install_emulator $DIR/lib/install-emulator
else else
images=$("$DIR/lib/list-emulator-images") images=$("$DIR/lib/list-emulator-images")
if [ $? = 0 ] ; then if [ $? = 0 ] ; then
$DIR/lib/start-emulator $DIR/lib/start-emulator
wait_for_emulator wait_for_emulator
$DIR/lib/install_emulator $DIR/lib/install-emulator
else else
echo "No Android devices attached, nor emulator images available to start. How are we supposed to do this, then?" echo "No Android devices attached, nor emulator images available to start. How are we supposed to do this, then?"
exit 2 exit 2