Updated install tools

Author: ByteSnipers

mpt/console.py

@@ -716,7 +716,7 @@ def cli():
 
     parser.add_argument('--update', help='Update MPT to the latest version', action='store_true')
 
-    pentest = parser.add_argument_group("Pentest", "Configure an manage current pentest")
+    pentest = parser.add_argument_group("Pentest", "Configure and manage current pentest")
 
     pentest.add_argument('--setup', metavar='[APK]', nargs=1, type=str, help='Setup pentest environment')
     pentest.add_argument('--config', help='Show current pentest config', action='store_true')
@@ -744,17 +744,17 @@ def cli():
 
     tools = parser.add_argument_group("Tools", "Perform app related tasks")
 
-    tools.add_argument('-i', '--install', metavar='tools|apps', nargs='?', type=str, const='',
+    tools.add_argument('-i', '--install-tools', action='store_true',
                        help='Install pentesting tools on local system in a separate environment')
-    tools.add_argument('-a', '--adb-run', help='Start adb server with root avoids a lot of issues using adb', action='store_true')
+    tools.add_argument('-a', '--adb-run', help='Start adb server with root to avoid a lot of issues using adb', action='store_true')
     tools.add_argument('-t', '--tool', metavar='tool', nargs='+',
                        help='Run selected tool with <arguments> (use option \'list\' to display all tools)')
 
     proxy_wifi = parser.add_argument_group("Proxy and WiFi", "Manage proxy on device and WiFi settings locally")
 
     proxy_wifi.add_argument('-ps', '--proxy-status', help='Check WiFi proxy status', action='store_true')
     proxy_wifi.add_argument('-pe', '--proxy-enable', metavar='host:port', nargs='?', type=str, const='',
-                            help='Set proxy for WiFi connection on your device (optional <host:port>), if not set load proxy settings from configuration file')
+                            help='Set proxy for WiFi connection on your device (optional <host:port>), if not set loads proxy settings from configuration file')
     proxy_wifi.add_argument('-pd', '--proxy-disable', help='Disable WiFi proxy ', action='store_true')
     # obsolete options
     # parser.add_argument('-e', '--inspeckage', help='Open Inspeckage web interface', action='store_true')
@@ -801,8 +801,8 @@ def cli():
         run_decompiler(decompiler=args.decompile)
 
     # Tool Options
-    if args.install or type(args.install) is str:
-        functions.install_packages(install=args.install)
+    if args.install_tools or type(args.install_tools) is str:
+        functions.install_tools()
     if args.adb_run:
         functions.run_adb()
     if args.tool:

mpt/functions.py

@@ -331,7 +331,8 @@ def install_http_archive(package):
 
         log.info('{} successfully installed\n'.format(package))
 
-
+# not used anymore
+"""
 def install_app(app):
 
     log.info('Installing {0} app'.format(Fore.CYAN + app + Style.RESET_ALL))
@@ -343,15 +344,14 @@ def install_app(app):
         log.error('File {} not found. Installation canceled.'.format(apk_file))
         sys.exit()
 
-    app_found = run_command(
-        command="""adb shell 'pm list packages -f' | grep {}""".format(pkg))
+    app_found = run_command(command="adb shell 'pm list packages -f' | grep {}".format(pkg))
 
     if not app_found:
         run_command(
             command="adb install {}".format(apk_file))
     else:
         log.warn('Package {} already installed. Skip installation.'.format(pkg))
-
+"""
 
 def check_requirements(package):
     # check tool requirements
@@ -383,30 +383,22 @@ def check_requirements(package):
         return True
 
 
-def install_packages(install):
+def install_tools():
 
     conf = Config()
     install_dir = conf.load_config('install-dir')
 
-    if install == 'tools':
-        for package in settings.ANDROID_TOOLS:
-            log.info('Installing {0} into directory: {1}'.format(Fore.CYAN + package + Style.RESET_ALL, install_dir))
-
-            # install package, if requirements are met
-            if check_requirements(package):
-                if settings.ANDROID_TOOLS[package]['install'] == 'git':
-                    install_git(package)
-                if settings.ANDROID_TOOLS[package]['install'] == 'http':
-                    install_http(package)
-                if settings.ANDROID_TOOLS[package]['install'] == 'local':
-                    install_local(package)
-
-    elif install == 'apps':
-        for app in settings.ANDROID_APKS:
-            install_app(app)
-
-    else:
-        log.error('Only options \'tools\' and \'apps\' are supported')
+    for package in settings.ANDROID_TOOLS:
+        log.info('Installing {0} into directory: {1}'.format(Fore.CYAN + package + Style.RESET_ALL, install_dir))
+
+        # install package, if requirements are met
+        if check_requirements(package):
+            if settings.ANDROID_TOOLS[package]['install'] == 'git':
+                install_git(package)
+            if settings.ANDROID_TOOLS[package]['install'] == 'http':
+                install_http(package)
+            if settings.ANDROID_TOOLS[package]['install'] == 'local':
+                install_local(package)
 
 
 def check_frida_is_running():