Merge pull request #6 from l4zy0n3/patch-2
added support for setting mirror-region to a dict or a string in config
This commit is contained in:
commit
8d7045b64c
|
|
@ -444,12 +444,18 @@ else:
|
||||||
archinstall.arguments['harddrive'].keep_partitions = False
|
archinstall.arguments['harddrive'].keep_partitions = False
|
||||||
# Temporary workaround to make Desktop Environments work
|
# Temporary workaround to make Desktop Environments work
|
||||||
if archinstall.arguments.get('profile', None) is not None:
|
if archinstall.arguments.get('profile', None) is not None:
|
||||||
archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None))
|
if type(archinstall.arguments.get('profile', None)) is dict:
|
||||||
|
archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)['path'])
|
||||||
|
else:
|
||||||
|
archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None))
|
||||||
else:
|
else:
|
||||||
archinstall.arguments['profile'] = None
|
archinstall.arguments['profile'] = None
|
||||||
if archinstall.arguments.get('mirror-region', None) is not None:
|
if archinstall.arguments.get('mirror-region', None) is not None:
|
||||||
selected_region = archinstall.arguments.get('mirror-region', None)
|
if type(archinstall.arguments.get('mirror-region', None)) is dict:
|
||||||
archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]}
|
archinstall.arguments['mirror-region'] = archinstall.arguments.get('mirror-region', None)
|
||||||
|
else:
|
||||||
|
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-language'] = archinstall.arguments.get('sys-language', 'en_US')
|
||||||
archinstall.arguments['sys-encoding'] = archinstall.arguments.get('sys-encoding', 'utf-8')
|
archinstall.arguments['sys-encoding'] = archinstall.arguments.get('sys-encoding', 'utf-8')
|
||||||
if archinstall.arguments.get('gfx_driver', None) is not None:
|
if archinstall.arguments.get('gfx_driver', None) is not None:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue