From 53cc381c76ebf2557b44d047ad0df3b76ce4b914 Mon Sep 17 00:00:00 2001 From: Fil Maj Date: Fri, 14 Jun 2013 14:44:26 -0700 Subject: [PATCH 1/2] removing unused script anymore from create. --- bin/create | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/create b/bin/create index 134100dd..4dfd20f8 100755 --- a/bin/create +++ b/bin/create @@ -144,7 +144,6 @@ cp "$BUILD_PATH"/bin/templates/cordova/clean "$PROJECT_PATH"/cordova/clean cp "$BUILD_PATH"/bin/templates/cordova/log "$PROJECT_PATH"/cordova/log cp "$BUILD_PATH"/bin/templates/cordova/run "$PROJECT_PATH"/cordova/run cp "$BUILD_PATH"/bin/templates/cordova/version "$PROJECT_PATH"/cordova/version -cp "$BUILD_PATH"/bin/templates/cordova/lib/cordova "$PROJECT_PATH"/cordova/lib/cordova cp "$BUILD_PATH"/bin/templates/cordova/lib/install-device "$PROJECT_PATH"/cordova/lib/install-device cp "$BUILD_PATH"/bin/templates/cordova/lib/install-emulator "$PROJECT_PATH"/cordova/lib/install-emulator cp "$BUILD_PATH"/bin/templates/cordova/lib/list-devices "$PROJECT_PATH"/cordova/lib/list-devices From 32d74f8623209cc3d9c0bd57c0a8ce88a9df85b0 Mon Sep 17 00:00:00 2001 From: Fil Maj Date: Fri, 14 Jun 2013 14:48:23 -0700 Subject: [PATCH 2/2] correct refs to various lib scripts in run. --- bin/templates/cordova/run | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/templates/cordova/run b/bin/templates/cordova/run index f47adca5..d871c09d 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