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/13 21:44:50 UTC
android commit: [CB-3626] fix to start-emulator: if no id is provided,
should start the first emulator
Updated Branches:
refs/heads/master 5cff144a2 -> e86d811fc
[CB-3626] fix to start-emulator: if no id is provided, should start the first emulator
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e86d811f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e86d811f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e86d811f
Branch: refs/heads/master
Commit: e86d811fc015b5b345aa810945327b83b86631be
Parents: 5cff144
Author: Fil Maj <ma...@gmail.com>
Authored: Thu Jun 13 12:44:43 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu Jun 13 12:44:43 2013 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/cordova | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e86d811f/bin/templates/cordova/lib/cordova
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/cordova b/bin/templates/cordova/lib/cordova
index 294df49..9783b37 100755
--- a/bin/templates/cordova/lib/cordova
+++ b/bin/templates/cordova/lib/cordova
@@ -82,10 +82,10 @@ function start_emulator {
fi
else
# start first emulator
- emulator_list=($emulator_images)
+ read -ra emulator_list <<< "$emulator_images"
if [[ ${#emulator_list[@]} > 0 ]] ; then
#xterm -e emulator -avd ${emulator_list[0]} &
- emulator -avd ${emulator_list[0]/[^a-zA-Z0-9._]/} 1> /dev/null 2>&1 &
+ emulator -avd ${emulator_list[0]/[^a-zA-Z0-9._-]/} 1> /dev/null 2>&1 &
else
echo "No emulators found, if you would like to create an emulator follow the instructions"
echo " provided here : http://developer.android.com/tools/devices/index.html"
@@ -383,4 +383,4 @@ elif [[ $# == 1 ]] ; then
else
echo "Error : No command recieved, exiting..."
exit 2
-fi
\ No newline at end of file
+fi