Skip to content

Commit fb98909

Browse files
committed
Clarified text
1 parent 13a7a61 commit fb98909

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

src/manage/commands.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -896,6 +896,7 @@ class HelpCommand(BaseCommand):
896896
"""
897897

898898
_create_log_file = False
899+
commands_only = False
899900

900901
def __init__(self, args, root=None):
901902
super().__init__([self.CMD], root)
@@ -906,7 +907,7 @@ def execute(self):
906907
self.show_welcome(copyright=False)
907908
if not self.args:
908909
self.show_usage()
909-
LOGGER.print(BaseCommand.help_text())
910+
LOGGER.print(BaseCommand.help_text(commands_only))
910911
for a in self.args:
911912
try:
912913
cls = COMMANDS[a.lower()]
@@ -991,8 +992,8 @@ def execute(self):
991992
from .firstrun import first_run
992993
first_run(self)
993994
if not self.explicit:
994-
show_help([])
995-
if self.confirm and not self.ask_ny(f"View more help online? (!B!{HELP_URL}!W!)"):
995+
self.show_usage()
996+
if self.confirm and not self.ask_ny(f"View online help?"):
996997
import os
997998
os.startfile(HELP_URL)
998999

src/manage/firstrun.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,8 @@ def first_run(cmd):
277277
"install manager!W!'.\n", wrap=True)
278278
if (
279279
cmd.confirm and
280-
not cmd.ask_ny("Open Settings now? Select !B!App execution "
281-
"aliases!W! after opening and scroll to the "
282-
"'!B!Python!W!' entries.")
280+
not cmd.ask_ny("Open Settings now, so you can modify !B!App "
281+
"execution aliases!W!?")
283282
):
284283
os.startfile("ms-settings:advanced-apps")
285284
LOGGER.print("\nThe Settings app should be open. Navigate to the "
@@ -300,15 +299,11 @@ def first_run(cmd):
300299
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
301300
"260 characters.!W!", level=logging.WARN)
302301
LOGGER.print("\nPython and some other apps can exceed this limit, "
303-
"but it requires changing a system-wide setting and a "
302+
"but it requires changing a system-wide setting, which "
303+
"may need an administrator to approve, and will require a "
304304
"reboot. Some packages may fail to install without long "
305305
"path support enabled.\n", wrap=True)
306-
if (
307-
cmd.confirm and
308-
not cmd.ask_ny("Update setting now? You may be prompted for "
309-
"administrator credentials, and must reboot for "
310-
"the change to take effect.")
311-
):
306+
if cmd.confirm and not cmd.ask_ny("Update setting now?"):
312307
os.startfile(sys.executable, "runas", "**configure-long-paths", show_cmd=0)
313308
for _ in range(5):
314309
time.sleep(0.25)
@@ -391,9 +386,10 @@ def first_run(cmd):
391386
if shown_any or cmd.explicit:
392387
line_break()
393388
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
394-
LOGGER.print("To run these checks again, launch !B!Python install "
389+
LOGGER.print("\nTo run these checks again, launch !B!Python install "
395390
"manager!W! from your Start menu, or !B!py install "
396391
"--configure!W! from the terminal.", wrap=True)
392+
line_break()
397393

398394

399395
if __name__ == "__main__":

0 commit comments

Comments
 (0)