From 91ecfc7f09326cf7bacbd014c2f6fb1cb4b605d3 Mon Sep 17 00:00:00 2001
From: ZeddYu <zeddyu.lu@gmail.com>
Date: Tue, 4 Jun 2024 19:40:51 +0800
Subject: [PATCH] Fix Import Error for Androguard >=4 Compatibility and Update
 setup.py Entry Points due to the possible error

---
 droidbot/app.py | 5 ++++-
 setup.py        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/droidbot/app.py b/droidbot/app.py
index dfb257957..f89bf7649 100644
--- a/droidbot/app.py
+++ b/droidbot/app.py
@@ -25,7 +25,10 @@ def __init__(self, app_path, output_dir=None):
             if not os.path.isdir(output_dir):
                 os.makedirs(output_dir)
 
-        from androguard.core.bytecodes.apk import APK
+        try:
+            from androguard.core.bytecodes.apk import APK
+        except ImportError:
+            from androguard.core.apk import APK
         self.apk = APK(self.app_path)
         self.package_name = self.apk.get_package()
         self.app_name = self.apk.get_app_name()
diff --git a/setup.py b/setup.py
index 2a18c5c6e..55dd5d857 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
     ],
     entry_points={
         'console_scripts': [
-            'droidbot=start:main',
+            'droidbot=droidbot.start:main',
         ],
     },
     package_data={