From d2b5ec0bfc969fbd458c712273703bb038555e4a Mon Sep 17 00:00:00 2001 From: Laurent Sansonetti Date: Tue, 27 May 2014 09:56:35 -0700 Subject: [PATCH] =?UTF-8?q?fix=20`rake=20start=5Favd=E2=80=99=20task=20to?= =?UTF-8?q?=20honor=20the=20`avd=E2=80=99=20env=20variable=20which=20can?= =?UTF-8?q?=20be=20used=20to=20override=20the=20default=20AVD=20configurat?= =?UTF-8?q?ion=20that=20should=20be=20used?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/motion/project/template/android.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/motion/project/template/android.rb b/lib/motion/project/template/android.rb index 12b84909..ee2c653c 100644 --- a/lib/motion/project/template/android.rb +++ b/lib/motion/project/template/android.rb @@ -402,9 +402,10 @@ namespace 'emulator' do desc "Start the emulator in the background" task :start_avd do - unless `/bin/ps -a`.split(/\n/).any? { |x| x.include?('emulator64-arm') and x.include?('RubyMotion') } + avd = (ENV['avd'] || App.config.avd_config[:name]) + unless `/bin/ps -a`.split(/\n/).any? { |x| x.include?('emulator64-arm') and x.include?(avd) } Rake::Task["emulator:create_avd"].invoke - sh "\"#{App.config.sdk_path}/tools/emulator\" -avd \"#{App.config.avd_config[:name]}\" &" + sh "\"#{App.config.sdk_path}/tools/emulator\" -avd \"#{avd}\" &" sh "\"#{App.config.sdk_path}/platform-tools/adb\" -e wait-for-device" end end