Removing baksmali from bin. Fixing a bug with external baksmali.

Author: Vincenzo Musco

bin/sa-disassemble

@@ -10,6 +10,7 @@ import subprocess
 import os
 import zipfile
 import re
+import smalanalysis
 
 COMPRESSION_METHOD = zipfile.ZIP_DEFLATED
 
@@ -45,11 +46,9 @@ def runSmali(apkpath, smalipath, overwrite=False, buildZip=False, mergeFolders=T
 
         baksmali_bin = custom_baksmali
         if baksmali_bin is None:
-            base = os.path.realpath(__file__)
-            base = base[:base.rindex('/')]
-            baksmali_bin = "{}/sa-baksmali-2.2.1.jar disassemble".format(base)
+            baksmali_bin = smalanalysis.get_baksmali_bin()
 
-        task = subprocess.Popen('java -jar %s "%s/%s" -o "%s"' % (baksmali_bin, apkpath, file, fullsmalipath), shell=True, stdout=subprocess.PIPE)
+        task = subprocess.Popen('java -jar %s disassemble "%s/%s" -o "%s"' % (baksmali_bin, apkpath, file, fullsmalipath), shell=True, stdout=subprocess.PIPE)
         task.wait()
 
     z.close()

setup.py

@@ -16,8 +16,8 @@
       author='Vincenzo Musco',
       author_email='[email protected]',
       license='MIT',
-      packages=['smalanalysis.smali', 'smalanalysis.tools'],
+      packages=['smalanalysis','smalanalysis.smali', 'smalanalysis.tools'],
       install_requires=[],
-      scripts=['bin/sa-disassemble', 'bin/sa-including-debug', 'bin/sa-metrics', 'bin/sa-baksmali-2.2.1.jar'],
+      scripts=['bin/sa-disassemble', 'bin/sa-including-debug', 'bin/sa-metrics'],
       include_package_data=True,
-      zip_safe=False)
+      zip_safe=False)

smalanalysis/__init__.py

@@ -0,0 +1,5 @@
+import os
+
+def get_baksmali_bin():
+    _ROOT = os.path.abspath(os.path.dirname(__file__))
+    return os.path.join(_ROOT, 'jar', 'baksmali-2.2.1.jar')