From 522f07b0d8d15b39c54eb1c4f2b88eff1584d33f Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Fri, 13 Oct 2023 00:04:32 +0200 Subject: [PATCH] v2.4.7 Signed-off-by: Jeroen Oudshoorn --- bin/pwnagotchi | 18 +++++++++++++----- pwnagotchi/google/cmd.py | 4 ++-- pwnagotchi/plugins/cmd.py | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/bin/pwnagotchi b/bin/pwnagotchi index 1fcdd81f..034c4efe 100755 --- a/bin/pwnagotchi +++ b/bin/pwnagotchi @@ -97,6 +97,17 @@ def do_auto_mode(agent): if __name__ == '__main__': + def add_parsers(parser): + """ + Adds the plugins and google subcommands to a given argparse.ArgumentParser + """ + subparsers = parser.add_subparsers() + + # Add parsers from plugins_cmd + plugins_cmd.add_parsers(subparsers) + + # Add parsers from google_cmd + google_cmd.add_parsers(subparsers) parser = argparse.ArgumentParser(prog="pwnagotchi") # pwnagotchi --help parser.add_argument('-C', '--config', action='store', dest='config', default='/etc/pwnagotchi/default.toml', @@ -127,11 +138,8 @@ if __name__ == '__main__': help="How to donate to this project.") # pwnagotchi plugins --help - parser_plugins = plugins_cmd.add_parsers(parser) - args = parser_plugins.parse_args() - - # pwnagotchi google --help - parser_google = google_cmd.add_parsers(parser) + add_parsers(parser) + args = parser.parse_args() if plugins_cmd.used_plugin_cmd(args): config = utils.load_config(args) diff --git a/pwnagotchi/google/cmd.py b/pwnagotchi/google/cmd.py index 5f3f0914..47d76f03 100644 --- a/pwnagotchi/google/cmd.py +++ b/pwnagotchi/google/cmd.py @@ -5,11 +5,11 @@ from pydrive2.auth import GoogleAuth import logging -def add_parsers(parser): +def add_parsers(subparsers): """ Adds the plugins subcommand to a given argparse.ArgumentParser """ - subparsers = parser.add_subparsers() + #subparsers = parser.add_subparsers() # pwnagotchi google parser_google = subparsers.add_parser('google') google_subparsers = parser_google.add_subparsers(dest='googlecmd') diff --git a/pwnagotchi/plugins/cmd.py b/pwnagotchi/plugins/cmd.py index ee752010..690dd85e 100644 --- a/pwnagotchi/plugins/cmd.py +++ b/pwnagotchi/plugins/cmd.py @@ -14,11 +14,11 @@ SAVE_DIR = '/usr/local/share/pwnagotchi/available-plugins/' DEFAULT_INSTALL_PATH = '/usr/local/share/pwnagotchi/installed-plugins/' -def add_parsers(parser): +def add_parsers(subparsers): """ Adds the plugins subcommand to a given argparse.ArgumentParser """ - subparsers = parser.add_subparsers() + #subparsers = parser.add_subparsers() # pwnagotchi plugins parser_plugins = subparsers.add_parser('plugins') plugin_subparsers = parser_plugins.add_subparsers(dest='plugincmd')