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

Removed /examples/ from list_profiles() by default 

Adding it back in in "module mode" so that it can find guided.py correctly. This voids showing it in the user-question section.
This commit is contained in:
Anton Hvornum 2020-12-06 16:30:29 +01:00
parent eaf4528276
commit 101f3bdde9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/__main__.py
View File

@ -12,6 +12,9 @@ def run_as_a_module():
This function and the file __main__ acts as a entry point. This function and the file __main__ acts as a entry point.
""" """
# Add another path for finding profiles, so that list_profiles() in Script() can find guided.py, unattended.py etc.
archinstall.storage['PROFILE_PATH'].append(os.path.abspath(f'{os.path.dirname(__file__)}/../examples'))
if len(sys.argv) == 1: if len(sys.argv) == 1:
sys.argv.append('guided') sys.argv.append('guided')
@ -22,6 +25,9 @@ def run_as_a_module():
sys.exit(1) sys.exit(1)
os.chdir(os.path.abspath(os.path.dirname(__file__))) os.chdir(os.path.abspath(os.path.dirname(__file__)))
# Remove the example directory from the PROFILE_PATH, to avoid guided.py etc shows up in user input questions.
archinstall.storage['PROFILE_PATH'].pop()
script.execute() script.execute()
if __name__ == '__main__': if __name__ == '__main__':

2
archinstall/lib/storage.py
View File

@ -12,7 +12,7 @@ storage = {
'./profiles', './profiles',
'~/.config/archinstall/profiles', '~/.config/archinstall/profiles',
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'profiles'), os.path.join(os.path.dirname(os.path.abspath(__file__)), 'profiles'),
os.path.abspath(f'{os.path.dirname(__file__)}/../examples') #os.path.abspath(f'{os.path.dirname(__file__)}/../examples')
], ],
'UPSTREAM_URL' : 'https://raw.githubusercontent.com/Torxed/archinstall/master/profiles', 'UPSTREAM_URL' : 'https://raw.githubusercontent.com/Torxed/archinstall/master/profiles',
'PROFILE_DB' : None # Used in cases when listing profiles is desired, not mandatory for direct profile grabing. 'PROFILE_DB' : None # Used in cases when listing profiles is desired, not mandatory for direct profile grabing.