lib/dryrun.rb in dryrun-1.3.0 vs lib/dryrun.rb in dryrun-1.3.2
- old
+ new
@@ -99,17 +99,17 @@
def pick_device
@device = nil
if !Gem.win_platform?
- @sdk = `echo $ANDROID_HOME`.delete("\n")
+ @sdk = `echo $ANDROID_SDK_ROOT`.delete("\n")
else
- @sdk = `echo %ANDROID_HOME%`.delete("\n")
+ @sdk = `echo %ANDROID_SDK_ROOT%`.delete("\n")
end
@sdk = 'adb' if @sdk.empty?
-
+
$sdk = @sdk
puts 'Searching for devices...'.yellow
@devices = DryrunUtils.run_adb('devices')
@@ -140,15 +140,15 @@
$device = @device
puts "Picked #{@device.name.to_s.green}" unless @device.nil?
end
- def android_home_is_defined
+ def android_sdk_root_is_defined
@sdk = if !Gem.win_platform?
- `echo $ANDROID_HOME`.delete('\n')
+ `echo $ANDROID_SDK_ROOT`.delete('\n')
else
- `echo %ANDROID_HOME%`.delete('\n')
+ `echo %ANDROID_SDK_ROOT%`.delete('\n')
end
!@sdk.empty?
end
def wipe_temporary_folder
@@ -158,12 +158,12 @@
puts 'Folder totally removed!'.green
exit 1
end
def call
- unless android_home_is_defined
- puts "\nWARNING: your #{'$ANDROID_HOME'.yellow} is not defined\n"
- puts "\nhint: in your #{'~/.bashrc'.yellow} or #{'~/.bash_profile'.yellow} add:\n #{"export ANDROID_HOME='/Users/cesarferreira/Library/Android/sdk/'".yellow}"
+ unless android_sdk_root_is_defined
+ puts "\nWARNING: your #{'$ANDROID_SDK_ROOT'.yellow} is not defined\n"
+ puts "\nhint: in your #{'~/.bashrc'.yellow} or #{'~/.bash_profile'.yellow} add:\n #{"export ANDROID_SDK_ROOT='/Users/cesarferreira/Library/Android/sdk/'".yellow}"
puts "\nNow type #{'source ~/.bashrc'.yellow}\n\n"
exit 1
end
if @url.nil?