From decf9119f27cba6a5aa3ae33b7c3e73d2f869af9 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 8 Nov 2020 23:22:26 +0000 Subject: Fixing a variable missmatch in #61. The global configuration snapshot (that is used for debug printing) does not contain the password for the new user (for safety reasons). So we can no longer get the password from that snapshot, but instead we have to get it from the global variable users (:dict). --- archinstall/lib/profiles.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py index f20726d2..e9eb9583 100644 --- a/archinstall/lib/profiles.py +++ b/archinstall/lib/profiles.py @@ -49,7 +49,10 @@ def find_examples(): :return: {'guided.py' : './examples/guided.py', '' : ''} :rtype: dict """ - cwd = os.path.abspath(f'{os.path.dirname(__file__)}') + + # We need to traverse backwards one step with /../ because + # We're living in src/lib/ and we're not executing from src/ anymore. + cwd = os.path.abspath(f'{os.path.dirname(__file__)}/../') examples = f"{cwd}/examples" return {os.path.basename(path): path for path in glob.glob(f'{examples}/*.py')} @@ -65,7 +68,9 @@ def find_installation_script(profile): with open(profile, 'r') as file: return Script(file.read(), filename=os.path.basename(profile)) except FileNotFoundError: - cwd = os.path.abspath(f'{os.path.dirname(__file__)}') + # We need to traverse backwards one step with /../ because + # We're living in src/lib/ and we're not executing from src/ anymore. + cwd = os.path.abspath(f'{os.path.dirname(__file__)}/../') examples = f"{cwd}/examples" raise ProfileNotFound(f"File {profile} does not exist in {examples}") elif parsed_url.scheme in ('https', 'http'): -- cgit v1.2.3-70-g09d2