Merge pull request #862 from cidermole/master

enable recipe package top-level directory names to be the same as the…
kivy · Aug 10, 2016 · 9d457e3 · 9d457e3
2 parents 149d9ea + 47e9bf3
commit 9d457e3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -1,4 +1,4 @@
-from os.path import join, dirname, isdir, exists, isfile, split, realpath
+from os.path import join, dirname, isdir, exists, isfile, split, realpath, basename
 import importlib
 import zipfile
 import glob
@@ -433,7 +433,7 @@ def unpack(self, arch):
                         import zipfile
                         fileh = zipfile.ZipFile(extraction_filename, 'r')
                         root_directory = fileh.filelist[0].filename.split('/')[0]
-                        if root_directory != directory_name:
+                        if root_directory != basename(directory_name):
                             shprint(sh.mv, root_directory, directory_name)
                     elif (extraction_filename.endswith('.tar.gz') or
                           extraction_filename.endswith('.tgz') or