From ec4c325efd664afe062b0ceca1b5bcafb288488a Mon Sep 17 00:00:00 2001 From: Toby Harradine Date: Fri, 8 Feb 2019 18:08:10 +1100 Subject: [PATCH] Guard parsing of CLI args in launcher, setup scripts (#2432) Signed-off-by: Toby Harradine --- redbot/launcher.py | 3 +-- redbot/setup.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/redbot/launcher.py b/redbot/launcher.py index 0b0a4116f..38080a516 100644 --- a/redbot/launcher.py +++ b/redbot/launcher.py @@ -447,6 +447,7 @@ def main_menu(): def main(): + args, flags_to_pass = parse_cli_args() if not PYTHON_OK: print( f"Python {'.'.join(map(str, MIN_PYTHON_VERSION))} is required to run Red, but you " @@ -473,8 +474,6 @@ def main(): run_red(args.instancename, autorestart=args.auto_restart, cliflags=flags_to_pass) -args, flags_to_pass = parse_cli_args() - if __name__ == "__main__": try: main() diff --git a/redbot/setup.py b/redbot/setup.py index ed9bf7eba..d34bb8035 100644 --- a/redbot/setup.py +++ b/redbot/setup.py @@ -371,6 +371,7 @@ async def remove_instance_interaction(): def main(): + args, _ = parse_cli_args() if args.delete: loop = asyncio.get_event_loop() loop.run_until_complete(remove_instance_interaction()) @@ -381,8 +382,6 @@ def main(): basic_setup() -args, _ = parse_cli_args() - if __name__ == "__main__": try: main()