From 4d3595ecfc2f58176f81fa1f78ab214fb61aaafe Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Thu, 20 May 2021 18:11:22 +0530 Subject: changed "desktop" to "profile" while loading config --- examples/guided.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/guided.py') diff --git a/examples/guided.py b/examples/guided.py index b3e87df7..f53078db 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -408,6 +408,6 @@ else: # Temporarily disabling keep_partitions if config file is loaded archinstall.arguments['harddrive'].keep_partitions = False # Temporary workaround to make Desktop Environments work - archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('desktop', None)) + archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)) perform_installation_steps() -- cgit v1.2.3-70-g09d2 From 33f1957e4d10d212c87f0500107d426ff871131a Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Fri, 21 May 2021 01:58:32 +0530 Subject: fallback added for when profile is null/empty --- examples/guided.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'examples/guided.py') diff --git a/examples/guided.py b/examples/guided.py index f53078db..c18e5039 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -408,6 +408,9 @@ else: # Temporarily disabling keep_partitions if config file is loaded archinstall.arguments['harddrive'].keep_partitions = False # Temporary workaround to make Desktop Environments work - archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)) + if archinstall.arguments.get('profile', None) is not None: + archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)) + else: + archinstall.arguments['profile'] = None perform_installation_steps() -- cgit v1.2.3-70-g09d2 From 23d223b15cacd5139150162a4328022ef12f6469 Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Fri, 21 May 2021 04:00:09 +0530 Subject: fixed creating profile object if profile is passed in vars --- examples/guided.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples/guided.py') diff --git a/examples/guided.py b/examples/guided.py index c18e5039..3a2bc1c0 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -179,6 +179,8 @@ def ask_user_questions(): # Ask for archinstall-specific profiles (such as desktop environments etc) if not archinstall.arguments.get('profile', None): archinstall.arguments['profile'] = archinstall.select_profile(archinstall.list_profiles(filter_top_level_profiles=True)) + else: + archinstall.arguments['profile'] = Profile(installer=None, path=archinstall.arguments['profile']) # Check the potentially selected profiles preparations to get early checks if some additional questions are needed. if archinstall.arguments['profile'] and archinstall.arguments['profile'].has_prep_function(): -- cgit v1.2.3-70-g09d2 From 9be8a3a998ed671749665dae3fc432305ababc64 Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Sun, 23 May 2021 11:52:21 +0530 Subject: updated mirror-region config key to use value directly --- examples/guided.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples/guided.py') diff --git a/examples/guided.py b/examples/guided.py index cbf30eb3..c6f40ac7 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -445,5 +445,7 @@ else: archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)) else: archinstall.arguments['profile'] = None + if archinstall.arguments.get('mirror-region', None) is not None: + archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[archinstall.arguments.get('mirror-region', None)]} perform_installation_steps() -- cgit v1.2.3-70-g09d2 From 87955e0ba659c46a42d7a48955054b47874b38e2 Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Sun, 23 May 2021 11:56:19 +0530 Subject: fixed pulling mirror-region from config --- examples/guided.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples/guided.py') diff --git a/examples/guided.py b/examples/guided.py index c6f40ac7..31d11396 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -446,6 +446,7 @@ else: else: archinstall.arguments['profile'] = None if archinstall.arguments.get('mirror-region', None) is not None: - archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[archinstall.arguments.get('mirror-region', None)]} + selected_region = archinstall.arguments.get('mirror-region', None) + archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]} perform_installation_steps() -- cgit v1.2.3-70-g09d2 From 1d04acb603e46f7dcd52b5ecd6686265bbdc3059 Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Sun, 23 May 2021 13:33:48 +0530 Subject: added pulling sys-language and sys-encoding from config --- examples/guided.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'examples/guided.py') diff --git a/examples/guided.py b/examples/guided.py index 31d11396..c3e5848b 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -448,5 +448,7 @@ else: if archinstall.arguments.get('mirror-region', None) is not None: selected_region = archinstall.arguments.get('mirror-region', None) archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]} - + archinstall.arguments['sys-language'] = archinstall.arguments.get('sys-language', 'en_US') + archinstall.arguments['sys-encoding'] = archinstall.arguments.get('sys-encoding', 'utf-8') + perform_installation_steps() -- cgit v1.2.3-70-g09d2