RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #344 from SecondThundeR/misc-cleanup 

Misc. cleanup
This commit is contained in:
Anton Hvornum 2021-04-27 18:48:48 +00:00 committed by GitHub
parent ae1253afab a706a98151
commit e7a429db11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/installer.py
View File

@ -90,14 +90,14 @@ class Installer():
self.genfstab() self.genfstab()
if not (missing_steps := self.post_install_check()): if not (missing_steps := self.post_install_check()):
self.log('Installation completed without any errors. You may now reboot.', bg='black', fg='green', level=logging.INFO) self.log('Installation completed without any errors. You may now reboot.', fg='green', level=logging.INFO)
self.sync_log_to_install_medium() self.sync_log_to_install_medium()
return True return True
else: else:
self.log('Some required steps were not successfully installed/configured before leaving the installer:', bg='black', fg='red', level=logging.WARNING) self.log('Some required steps were not successfully installed/configured before leaving the installer:', fg='red', level=logging.WARNING)
for step in missing_steps: for step in missing_steps:
self.log(f' - {step}', bg='black', fg='red', level=logging.WARNING) self.log(f' - {step}', fg='red', level=logging.WARNING)
self.log(f"Detailed error logs can be found at: {storage['LOG_PATH']}", level=logging.WARNING) self.log(f"Detailed error logs can be found at: {storage['LOG_PATH']}", level=logging.WARNING)
self.log(f"Submit this zip file as an issue to https://github.com/archlinux/archinstall/issues", level=logging.WARNING) self.log(f"Submit this zip file as an issue to https://github.com/archlinux/archinstall/issues", level=logging.WARNING)

5
archinstall/lib/user_interaction.py
View File

@ -289,7 +289,7 @@ def generic_select(options, input_text="Select one of the above by index or abso
print(f"{index}: {option}") print(f"{index}: {option}")
# The new changes introduce a single while loop for all inputs processed by this function # The new changes introduce a single while loop for all inputs processed by this function
# Now the try...except...else block handles validation for invalid input from the user # Now the try...except block handles validation for invalid input from the user
while True: while True:
try: try:
selected_option = input(input_text) selected_option = input(input_text)
@ -305,6 +305,7 @@ def generic_select(options, input_text="Select one of the above by index or abso
if selected_option >= len(options): if selected_option >= len(options):
raise RequirementError(f'Selected option "{selected_option}" is out of range') raise RequirementError(f'Selected option "{selected_option}" is out of range')
selected_option = options[selected_option] selected_option = options[selected_option]
break
elif selected_option in options: elif selected_option in options:
break # We gave a correct absolute value break # We gave a correct absolute value
else: else:
@ -312,8 +313,6 @@ def generic_select(options, input_text="Select one of the above by index or abso
except RequirementError as err: except RequirementError as err:
log(f" * {err} * ", fg='red') log(f" * {err} * ", fg='red')
continue continue
else:
break
return selected_option return selected_option

4
examples/guided.py
View File

@ -205,10 +205,10 @@ def ask_user_questions():
archinstall.arguments['kernels'] = 'linux' archinstall.arguments['kernels'] = 'linux'
# Additional packages (with some light weight error handling for invalid package names) # Additional packages (with some light weight error handling for invalid package names)
print("Only packages such as base, base-devel, linux, linux-firmware, efibootmgr and optional profile packages are installed.")
print("If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt.")
while True: while True:
if not archinstall.arguments.get('packages', None): if not archinstall.arguments.get('packages', None):
print("Only packages such as base, base-devel, linux, linux-firmware, efibootmgr (on UEFI systems)/GRUB (on BIOS systems) and optional profile packages are installed.")
print("If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt.")
archinstall.arguments['packages'] = [package for package in input('Write additional packages to install (space separated, leave blank to skip): ').split(' ') if len(package)] archinstall.arguments['packages'] = [package for package in input('Write additional packages to install (space separated, leave blank to skip): ').split(' ') if len(package)]
if len(archinstall.arguments['packages']): if len(archinstall.arguments['packages']):