Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ flake8:
- flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics

# We currently do not have unit tests implemented but this stage is written in anticipation of their future usage.
# When a stage name is preceeded with a '.' it's treated as "disabled" by GitLab and is not executed, so it's fine for it to be declared.
# When a stage name is preceded with a '.' it's treated as "disabled" by GitLab and is not executed, so it's fine for it to be declared.
.pytest:
stage: test
tags:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ archinstall --config <path to user config file or URL> --creds <path to user cre
```

### Credentials configuration file encryption
By default all user account credentials are hashed with `yescrypt` and only the hash is stored in the saved `user_credentials.json` file.
By default, all user account credentials are hashed with `yescrypt` and only the hash is stored in the saved `user_credentials.json` file.
This is not possible for disk encryption password which needs to be stored in plaintext to be able to apply it.

However, when selecting to save configuration files, `archinstall` will prompt for the option to encrypt the `user_credentials.json` file content.
Expand All @@ -75,7 +75,7 @@ there are multiple ways to provide the decryption key:

# Help or Issues

If you come across any issues, kindly submit your issue here on Github or post your query in the
If you come across any issues, kindly submit your issue here on GitHub or post your query in the
[discord](https://discord.gg/aDeMffrxNg) help channel.

When submitting an issue, please:
Expand Down
2 changes: 1 addition & 1 deletion archinstall/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def run_as_a_module() -> None:
text = (
'Archinstall experienced the above error. If you think this is a bug, please report it to\n'
'https://github.com/archlinux/archinstall and include the log file "/var/log/archinstall/install.log".\n\n'
"Hint: To extract the log from a live ISO \ncurl -F'file=@/var/log/archinstall/install.log' https://0x0.st\n"
"Hint: To extract the log from a live ISO \ncurl -F 'file=@/var/log/archinstall/install.log' https://0x0.st\n"
)

warn(text)
Expand Down
2 changes: 1 addition & 1 deletion archinstall/default_profiles/desktops/enlightenment.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from archinstall.default_profiles.xorg import XorgProfile


class EnlighenmentProfile(XorgProfile):
class EnlightenmentProfile(XorgProfile):
def __init__(self) -> None:
super().__init__('Enlightenment', ProfileType.WindowMgr)

Expand Down
4 changes: 2 additions & 2 deletions archinstall/lib/applications/application_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def __init__(
else:
self._app_config = ApplicationConfiguration()

menu_optioons = self._define_menu_options()
self._item_group = MenuItemGroup(menu_optioons, checkmarks=True)
menu_options = self._define_menu_options()
self._item_group = MenuItemGroup(menu_options, checkmarks=True)

super().__init__(
self._item_group,
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def from_config(cls, args_config: dict[str, Any], args: Arguments) -> 'ArchConfi
arch_config.auth_config = AuthenticationConfiguration()
arch_config.auth_config.root_enc_password = root_password

# DEPRECATED: backwards copatibility
# DEPRECATED: backwards compatibility
users: list[User] = []
if args_users := args_config.get('!users', None):
users = User.parse_arguments(args_users)
Expand Down
4 changes: 2 additions & 2 deletions archinstall/lib/authentication/authentication_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ def __init__(self, preset: AuthenticationConfiguration | None = None):
else:
self._auth_config = AuthenticationConfiguration()

menu_optioons = self._define_menu_options()
self._item_group = MenuItemGroup(menu_optioons, checkmarks=True)
menu_options = self._define_menu_options()
self._item_group = MenuItemGroup(menu_options, checkmarks=True)

super().__init__(
self._item_group,
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/crypt.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def crypt_gen_salt(prefix: str | bytes, rounds: int) -> bytes:

def crypt_yescrypt(plaintext: str) -> str:
"""
By default chpasswd in Arch uses PAM to to hash the password with crypt_yescrypt
By default chpasswd in Arch uses PAM to hash the password with crypt_yescrypt
the PAM code https://github.com/linux-pam/linux-pam/blob/master/modules/pam_unix/support.c
shows that the hashing rounds are determined from YESCRYPT_COST_FACTOR in /etc/login.defs
If no value was specified (or commented out) a default of 5 is choosen
Expand Down
4 changes: 2 additions & 2 deletions archinstall/lib/disk/disk_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ def __init__(self, disk_layout_config: DiskLayoutConfiguration | None):
btrfs_snapshot_config=snapshot_config,
)

menu_optioons = self._define_menu_options()
self._item_group = MenuItemGroup(menu_optioons, sort_items=False, checkmarks=True)
menu_options = self._define_menu_options()
self._item_group = MenuItemGroup(menu_options, sort_items=False, checkmarks=True)

super().__init__(
self._item_group,
Expand Down
4 changes: 2 additions & 2 deletions archinstall/lib/disk/encryption_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ def __init__(
self._device_modifications = device_modifications
self._lvm_config = lvm_config

menu_optioons = self._define_menu_options()
self._item_group = MenuItemGroup(menu_optioons, sort_items=False, checkmarks=True)
menu_options = self._define_menu_options()
self._item_group = MenuItemGroup(menu_options, sort_items=False, checkmarks=True)

super().__init__(
self._item_group,
Expand Down
4 changes: 2 additions & 2 deletions archinstall/lib/global_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
class GlobalMenu(AbstractMenu[None]):
def __init__(self, arch_config: ArchConfig) -> None:
self._arch_config = arch_config
menu_optioons = self._get_menu_options()
menu_options = self._get_menu_options()

self._item_group = MenuItemGroup(
menu_optioons,
menu_options,
sort_items=False,
checkmarks=True,
)
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def __exit__(self, exc_type: type[BaseException] | None, exc_value: BaseExceptio
self.sync_log_to_install_medium()

# We avoid printing /mnt/<log path> because that might confuse people if they note it down
# and then reboot, and a identical log file will be found in the ISO medium anyway.
# and then reboot, and an identical log file will be found in the ISO medium anyway.
Tui.print(str(tr('[!] A log file has been created here: {}').format(logger.path)))
Tui.print(tr('Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues'))

Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/interactions/system_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def select_kernel(preset: list[str] = []) -> list[str]:

def select_driver(options: list[GfxDriver] = [], preset: GfxDriver | None = None) -> GfxDriver | None:
"""
Some what convoluted function, whose job is simple.
Somewhat convoluted function, whose job is simple.
Select a graphics driver from a pre-defined set of popular options.

(The template xorg is for beginner users, not advanced, and should
Expand Down
4 changes: 2 additions & 2 deletions archinstall/lib/locale/locale_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ def __init__(
locale_conf: LocaleConfiguration,
):
self._locale_conf = locale_conf
menu_optioons = self._define_menu_options()
menu_options = self._define_menu_options()

self._item_group = MenuItemGroup(menu_optioons, sort_items=False, checkmarks=True)
self._item_group = MenuItemGroup(menu_options, sort_items=False, checkmarks=True)
super().__init__(
self._item_group,
config=self._locale_conf,
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/menu/list_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@ def handle_action(self, action: str, entry: ValueT | None, data: list[ValueT]) -

def filter_options(self, selection: ValueT, options: list[str]) -> list[str]:
"""
filter which actions to show for an specific selection
filter which actions to show for a specific selection
"""
return options
4 changes: 2 additions & 2 deletions archinstall/lib/mirrors.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ def __init__(
else:
self._mirror_config = MirrorConfiguration()

menu_optioons = self._define_menu_options()
self._item_group = MenuItemGroup(menu_optioons, checkmarks=True)
menu_options = self._define_menu_options()
self._item_group = MenuItemGroup(menu_options, checkmarks=True)

super().__init__(
self._item_group,
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/models/mirrors.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def speed(self) -> float:
@property
def latency(self) -> float | None:
"""
Latency measures the miliseconds between one ICMP request & response.
Latency measures the milliseconds between one ICMP request & response.
It only does so once because we check if self._latency is None, and a ICMP timeout result in -1
We do this because some hosts blocks ICMP so we'll have to rely on .speed() instead which is slower.
"""
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/packages/packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def find_packages(*names: str) -> dict[str, PackageSearchResult]:
def validate_package_list(packages: list[str]) -> tuple[list[str], list[str]]:
"""
Validates a list of given packages.
return: Tuple of lists containing valid packavges in the first and invalid
return: Tuple of lists containing valid packages in the first and invalid
packages in the second entry
"""
valid_packages = {package for package in packages if find_package(package)}
Expand Down
4 changes: 2 additions & 2 deletions archinstall/lib/profile/profile_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ def __init__(
else:
self._profile_config = ProfileConfiguration()

menu_optioons = self._define_menu_options()
self._item_group = MenuItemGroup(menu_optioons, checkmarks=True)
menu_options = self._define_menu_options()
self._item_group = MenuItemGroup(menu_options, checkmarks=True)

super().__init__(
self._item_group,
Expand Down
4 changes: 2 additions & 2 deletions archinstall/scripts/guided.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ def perform_installation(mountpoint: Path) -> None:

# If the user provided a list of services to be enabled, pass the list to the enable_service function.
# Note that while it's called enable_service, it can actually take a list of services and iterate it.
if servies := config.services:
installation.enable_service(servies)
if services := config.services:
installation.enable_service(services)

if disk_config.has_default_btrfs_vols():
btrfs_options = disk_config.btrfs_options
Expand Down
2 changes: 1 addition & 1 deletion archinstall/scripts/minimal.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def perform_installation(mountpoint: Path) -> None:
disk_config,
kernels=config.kernels,
) as installation:
# Strap in the base system, add a boot loader and configure
# Strap in the base system, add a bootloader and configure
# some other minor details as specified by this profile and user.
installation.mount_ordered_layout()
installation.minimal_installation()
Expand Down
4 changes: 2 additions & 2 deletions archinstall/tui/menu_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ def __init__(
self._prev_visible_rows: list[int] = []
self._view_items: list[list[MenuItem]] = []

def _determine_foucs_row(self) -> int | None:
def _determine_focus_row(self) -> int | None:
focus_index = self._item_group.index_focus()

if focus_index is None:
Expand All @@ -406,7 +406,7 @@ def _determine_foucs_row(self) -> int | None:

def get_view_items(self) -> list[list[MenuItem]]:
enabled_items = self._item_group.get_enabled_items()
focus_row_idx = self._determine_foucs_row()
focus_row_idx = self._determine_focus_row()

if focus_row_idx is None:
return []
Expand Down
2 changes: 1 addition & 1 deletion docs/help/report_bug.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ When submitting a help ticket, please include the :code:`/var/log/archinstall/in
It can be found both on the live ISO but also in the installed filesystem if the base packages were strapped in.

.. tip::
| An easy way to submit logs is ``curl -F'file=@/var/log/archinstall/install.log' https://0x0.st``.
| An easy way to submit logs is ``curl -F 'file=@/var/log/archinstall/install.log' https://0x0.st``.
| Use caution when submitting other log files, but ``archinstall`` pledges to keep ``install.log`` safe for posting publicly!

There are additional log files under ``/var/log/archinstall/`` that can be useful:
Expand Down
2 changes: 1 addition & 1 deletion examples/mac_address_installation.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

for _profile in profile_handler.get_mac_addr_profiles():
# Tailored means it's a match for this machine
# based on it's MAC address (or some other criteria
# based on its MAC address (or some other criteria
# that fits the requirements for this machine specifically).
info(f'Found a tailored profile for this machine called: "{_profile.name}"')

Expand Down
Loading