| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/user_interaction.py | 5 | ||||
| -rw-r--r-- | examples/guided.py | 4 |
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index 71ba2538..5eb25b19 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -289,7 +289,7 @@ def generic_select(options, input_text="Select one of the above by index or abso print(f"{index}: {option}") # 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: try: 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): raise RequirementError(f'Selected option "{selected_option}" is out of range') selected_option = options[selected_option] + break elif selected_option in options: break # We gave a correct absolute value else: @@ -312,8 +313,6 @@ def generic_select(options, input_text="Select one of the above by index or abso except RequirementError as err: log(f" * {err} * ", fg='red') continue - else: - break return selected_option diff --git a/examples/guided.py b/examples/guided.py index 43aaa788..6b9cfd24 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -205,10 +205,10 @@ def ask_user_questions(): archinstall.arguments['kernels'] = 'linux' # 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: 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)] if len(archinstall.arguments['packages']): |