Merge remote-tracking branch 'origin/master'

buildozer/__init__.py

@@ -22,7 +22,7 @@
 from subprocess import Popen, PIPE, TimeoutExpired
 from os import environ, unlink, walk, sep, listdir, makedirs
 from copy import copy
-from shutil import copyfile, rmtree, copytree, move
+from shutil import copyfile, rmtree, copytree, move, which
 from fnmatch import fnmatch
 
 from pprint import pformat
@@ -243,13 +243,10 @@ def error(self, msg):
 
     def checkbin(self, msg, fn):
         self.debug('Search for {0}'.format(msg))
-        if exists(fn):
-            return realpath(fn)
-        for dn in environ['PATH'].split(':'):
-            rfn = realpath(join(dn, fn))
-            if exists(rfn):
-                self.debug(' -> found at {0}'.format(rfn))
-                return rfn
+        executable_location = which(fn)
+        if executable_location:
+            self.debug(' -> found at {0}'.format(executable_location))
+            return realpath(executable_location)
         self.error('{} not found, please install it.'.format(msg))
         exit(1)
 

buildozer/default.spec

@@ -323,7 +323,7 @@ android.allow_backup = True
 # (str) python-for-android specific commit to use, defaults to HEAD, must be within p4a.branch
 #p4a.commit = HEAD
 
-# (str) python-for-android git clone directory (if empty, it will be automatically cloned from github)
+# (str) python-for-android git clone directory
 #p4a.source_dir =
 
 # (str) The directory in which python-for-android should look for your own build recipes (if any)