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

Simplified the code a bit by removing the log file setup. It's not handled by archinstall.output.log(). Also moved two variable setups to the top.

This commit is contained in:
Anton Hvornum 2021-01-25 00:11:34 +01:00
parent 435d2f687e
commit 40622265a2
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/guided.py
View File

@ -1,15 +1,10 @@
import getpass, time, json, sys, signal, os import getpass, time, json, sys, signal, os
import archinstall import archinstall
# Setup a global log file. # Create a storage structure for all our information.
# Archinstall will honor storage['logfile'] in most of it's functions log handle. # We'll print this right before the user gets informed about the formatting timer.
log_root = os.path.join(os.path.expanduser('~/'), '.cache/archinstall') archinstall.storage['_guided'] = {}
if not os.path.isdir(log_root): archinstall.storage['_guided_hidden'] = {} # This will simply be hidden from printouts and things.
os.makedirs(log_root)
init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
milliseconds = int(str(time.time()).split('.')[1])
archinstall.storage['logfile'] = f"{log_root}/install-session_{init_time}.{milliseconds}.log"
""" """
This signal-handler chain (and global variable) This signal-handler chain (and global variable)
@ -77,6 +72,7 @@ def perform_installation(device, boot_partition, language, mirrors):
archinstall.sys_command(f'umount -R /mnt', suppress_errors=True) archinstall.sys_command(f'umount -R /mnt', suppress_errors=True)
archinstall.sys_command(f'cryptsetup close /dev/mapper/luksloop', suppress_errors=True) archinstall.sys_command(f'cryptsetup close /dev/mapper/luksloop', suppress_errors=True)
""" """
First, we'll ask the user for a bunch of user input. First, we'll ask the user for a bunch of user input.
Not until we're satisfied with what we want to install Not until we're satisfied with what we want to install
@ -87,11 +83,6 @@ if len(keyboard_language := archinstall.select_language(archinstall.list_keyboar
archinstall.set_keyboard_language(keyboard_language) archinstall.set_keyboard_language(keyboard_language)
archinstall.storage['_guided']['keyboard_layout'] = keyboard_language archinstall.storage['_guided']['keyboard_layout'] = keyboard_language
# Create a storage structure for all our information.
# We'll print this right before the user gets informed about the formatting timer.
archinstall.storage['_guided'] = {}
archinstall.storage['_guided_hidden'] = {} # This will simply be hidden from printouts and things.
# Set which region to download packages from during the installation # Set which region to download packages from during the installation
mirror_regions = archinstall.select_mirror_regions(archinstall.list_mirrors()) mirror_regions = archinstall.select_mirror_regions(archinstall.list_mirrors())
archinstall.storage['_guided']['mirrors'] = mirror_regions archinstall.storage['_guided']['mirrors'] = mirror_regions