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

Added error handling to guided.py when not selecting a profile to install.

This commit is contained in:
Anton Hvornum 2020-10-18 13:20:58 +02:00
parent 0e8130af9a
commit 9c5d1e9891
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall/lib/user_interaction.py
View File

@ -81,11 +81,9 @@ def select_profile(options):
print(' -- (Leave blank to skip this next optional step) --') print(' -- (Leave blank to skip this next optional step) --')
selected_profile = input('Any particular pre-programmed profile you want to install: ') selected_profile = input('Any particular pre-programmed profile you want to install: ')
#print(' -- You can enter ? or help to search for more profiles --') if len(selected_profile.strip()) <= 0:
#if selected_profile.lower() in ('?', 'help'): return None
# filter_string = input('Search for layout containing (example: "sv-"): ')
# new_options = search_keyboard_layout(filter_string)
# return select_language(new_options)
if selected_profile.isdigit() and (pos := int(selected_profile)) <= len(profiles)-1: if selected_profile.isdigit() and (pos := int(selected_profile)) <= len(profiles)-1:
selected_profile = profiles[pos] selected_profile = profiles[pos]
elif selected_profile in options: elif selected_profile in options:

2
examples/guided.py
View File

@ -24,7 +24,7 @@ def perform_installation(device, boot_partition, language, mirrors):
if len(packages) and packages[0] != '': if len(packages) and packages[0] != '':
installation.add_additional_packages(packages) installation.add_additional_packages(packages)
if len(profile.strip()): if profile and len(profile.strip()):
installation.install_profile(profile) installation.install_profile(profile)
for user, password in users.items(): for user, password in users.items():