CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix extras in launcher (#2588)

Browse Source 
Now non-existent voice extra was still hanging around in the launcher while the style extra was never added in
This commit is contained in:
palmtree5 2019-04-22 14:46:07 -08:00 committed by GitHub
parent b8190c44a8
commit 13611e34d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
redbot/launcher.py
View File

@ -61,11 +61,11 @@ def parse_cli_args():
parser.add_argument( parser.add_argument(
"--update-dev", help="Updates Red from the Github repo", action="store_true" "--update-dev", help="Updates Red from the Github repo", action="store_true"
) )
parser.add_argument(
"--voice", help="Installs extra 'voice' when updating", action="store_true"
)
parser.add_argument("--docs", help="Installs extra 'docs' when updating", action="store_true") parser.add_argument("--docs", help="Installs extra 'docs' when updating", action="store_true")
parser.add_argument("--test", help="Installs extra 'test' when updating", action="store_true") parser.add_argument("--test", help="Installs extra 'test' when updating", action="store_true")
parser.add_argument(
"--style", help="Installs extra 'style' when updating", action="store_true"
)
parser.add_argument( parser.add_argument(
"--mongo", help="Installs extra 'mongo' when updating", action="store_true" "--mongo", help="Installs extra 'mongo' when updating", action="store_true"
) )
@ -77,7 +77,7 @@ def parse_cli_args():
return parser.parse_known_args() return parser.parse_known_args()
def update_red(dev=False, voice=False, mongo=False, docs=False, test=False): def update_red(dev=False, style=False, mongo=False, docs=False, test=False):
interpreter = sys.executable interpreter = sys.executable
print("Updating Red...") print("Updating Red...")
# If the user ran redbot-launcher.exe, updating with pip will fail # If the user ran redbot-launcher.exe, updating with pip will fail
@ -94,8 +94,8 @@ def update_red(dev=False, voice=False, mongo=False, docs=False, test=False):
os.remove(new_name) os.remove(new_name)
os.rename(old_name, new_name) os.rename(old_name, new_name)
egg_l = [] egg_l = []
if voice: if style:
egg_l.append("voice") egg_l.append("style")
if mongo: if mongo:
egg_l.append("mongo") egg_l.append("mongo")
if docs: if docs:
@ -293,7 +293,7 @@ def user_choice():
def extras_selector(): def extras_selector():
print("Enter any extra requirements you want installed\n") print("Enter any extra requirements you want installed\n")
print("Options are: voice, docs, test, mongo\n") print("Options are: style, docs, test, mongo\n")
selected = user_choice() selected = user_choice()
selected = selected.split() selected = selected.split()
return selected return selected
@ -315,7 +315,7 @@ def development_choice(can_go_back=True):
selected = extras_selector() selected = extras_selector()
update_red( update_red(
dev=False, dev=False,
voice=True if "voice" in selected else False, style=True if "style" in selected else False,
docs=True if "docs" in selected else False, docs=True if "docs" in selected else False,
test=True if "test" in selected else False, test=True if "test" in selected else False,
mongo=True if "mongo" in selected else False, mongo=True if "mongo" in selected else False,
@ -325,7 +325,7 @@ def development_choice(can_go_back=True):
selected = extras_selector() selected = extras_selector()
update_red( update_red(
dev=True, dev=True,
voice=True if "voice" in selected else False, style=True if "style" in selected else False,
docs=True if "docs" in selected else False, docs=True if "docs" in selected else False,
test=True if "test" in selected else False, test=True if "test" in selected else False,
mongo=True if "mongo" in selected else False, mongo=True if "mongo" in selected else False,
@ -463,9 +463,9 @@ def main():
"Please try again using only one of --update or --update-dev" "Please try again using only one of --update or --update-dev"
) )
if args.update: if args.update:
update_red(voice=args.voice, docs=args.docs, test=args.test, mongo=args.mongo) update_red(style=args.style, docs=args.docs, test=args.test, mongo=args.mongo)
elif args.update_dev: elif args.update_dev:
update_red(dev=True, voice=args.voice, docs=args.docs, test=args.test, mongo=args.mongo) update_red(dev=True, style=args.style, docs=args.docs, test=args.test, mongo=args.mongo)
if INTERACTIVE_MODE: if INTERACTIVE_MODE:
main_menu() main_menu()