From 4dcafa7ec87f021af109209d27a51ac4c9efb0db Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 1 Sep 2020 14:52:59 +0200 Subject: Tweaking the mirror selection vs automatic mirror processes. --- archinstall/lib/services.py | 2 +- archinstall/lib/user_interaction.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/services.py b/archinstall/lib/services.py index 048c4879..43051f0f 100644 --- a/archinstall/lib/services.py +++ b/archinstall/lib/services.py @@ -9,5 +9,5 @@ def service_state(service_name :str): state = b''.join(sys_command(f'systemctl show -p SubState --value {service_name}')) - return state.decode('UTF-8') + return state.strip().decode('UTF-8') \ No newline at end of file diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index 8e76ac55..9f939f12 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -58,9 +58,13 @@ def select_mirror_regions(mirrors, show_top_mirrors=True): print(f"{index}: {region}") print(' -- You can enter ? or help to search for more regions --') + print(' -- You can skip this step by leaving the option blank --') print(' -- (You can use Shift + PageUp to scroll in the list --') selected_mirror = input('Select one of the above regions to download packages from (by number or full name): ') - if selected_mirror.lower() in ('?', 'help'): + if len(selected_mirror.strip()) == 0: + return {} + + elif selected_mirror.lower() in ('?', 'help'): filter_string = input('Search for a region containing (example: "united"): ').strip().lower() for region in mirrors: if filter_string in region.lower(): -- cgit v1.2.3-70-g09d2