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

Added additional user-verification to guided.py 

Also spelling error in subpath
This commit is contained in:
Anton Hvornum 2020-12-06 12:03:36 +01:00
parent b6c6e414b1
commit 1edb8f6f72
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall/lib/profiles.py
View File

@ -15,7 +15,7 @@ def grab_url_data(path):
response = urllib.request.urlopen(safe_path, context=ssl_context) response = urllib.request.urlopen(safe_path, context=ssl_context)
return response.read() return response.read()
def list_profiles(filter_irrelevant_macs=True, sub_path=''): def list_profiles(filter_irrelevant_macs=True, subpath=''):
# TODO: Grab from github page as well, not just local static files # TODO: Grab from github page as well, not just local static files
if filter_irrelevant_macs: if filter_irrelevant_macs:
local_macs = list_interfaces() local_macs = list_interfaces()
@ -23,7 +23,7 @@ def list_profiles(filter_irrelevant_macs=True, sub_path=''):
cache = {} cache = {}
# Grab all local profiles found in PROFILE_PATH # Grab all local profiles found in PROFILE_PATH
for PATH_ITEM in storage['PROFILE_PATH']: for PATH_ITEM in storage['PROFILE_PATH']:
for root, folders, files in os.walk(os.path.abspath(os.path.expanduser(PATH_ITEM+sub_path))): for root, folders, files in os.walk(os.path.abspath(os.path.expanduser(PATH_ITEM+subpath))):
for file in files: for file in files:
if os.path.splitext(file)[1] == '.py': if os.path.splitext(file)[1] == '.py':
tailored = False tailored = False
@ -43,7 +43,7 @@ def list_profiles(filter_irrelevant_macs=True, sub_path=''):
# Grab profiles from upstream URL # Grab profiles from upstream URL
if storage['PROFILE_DB']: if storage['PROFILE_DB']:
profiles_url = os.path.join(storage["UPSTREAM_URL"]+sub_path, storage['PROFILE_DB']) profiles_url = os.path.join(storage["UPSTREAM_URL"]+subpath, storage['PROFILE_DB'])
try: try:
profile_list = json.loads(grab_url_data(profiles_url)) profile_list = json.loads(grab_url_data(profiles_url))
except urllib.error.HTTPError as err: except urllib.error.HTTPError as err:
@ -61,7 +61,7 @@ def list_profiles(filter_irrelevant_macs=True, sub_path=''):
continue continue
tailored = True tailored = True
cache[profile[:-3]] = {'path' : os.path.join(storage["UPSTREAM_URL"]+sub_path, profile), 'description' : profile_list[profile], 'tailored' : tailored} cache[profile[:-3]] = {'path' : os.path.join(storage["UPSTREAM_URL"]+subpath, profile), 'description' : profile_list[profile], 'tailored' : tailored}
return cache return cache

2
examples/guided.py
View File

@ -226,6 +226,8 @@ archinstall.log("-- Guided template chosen (with below config) --", level=archin
archinstall.log(json.dumps(archinstall.storage['_guided'], indent=4, sort_keys=True, cls=archinstall.JSON), level=archinstall.LOG_LEVELS.Info) archinstall.log(json.dumps(archinstall.storage['_guided'], indent=4, sort_keys=True, cls=archinstall.JSON), level=archinstall.LOG_LEVELS.Info)
print() print()
input('Press Enter to continue.')
""" """
Issue a final warning before we continue with something un-revertable. Issue a final warning before we continue with something un-revertable.
We mention the drive one last time, and count from 5 to 0. We mention the drive one last time, and count from 5 to 0.