Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix many typos #1692

Merged
merged 1 commit into from
Sep 18, 2023
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 archinstall/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
storage['__version__'] = __version__


# add the custome _ as a builtin, it can now be used anywhere in the
# add the custom _ as a builtin, it can now be used anywhere in the
# project to mark strings as translatable with _('translate me')
DeferredTranslation.install()

Expand Down
6 changes: 3 additions & 3 deletions archinstall/default_profiles/profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def current_selection(self) -> List[TProfile]:
def packages(self) -> List[str]:
"""
Returns a list of packages that should be installed when
this profile is among the choosen ones
this profile is among the chosen ones
"""
return self._packages

Expand Down Expand Up @@ -128,7 +128,7 @@ def set_custom_settings(self, settings: Dict[str, Any]):
"""
Set the custom settings for the profile.
This is also called when the settings are parsed from the config
and can be overriden to perform further actions based on the profile
and can be overridden to perform further actions based on the profile
"""
self.custom_settings = settings

Expand Down Expand Up @@ -179,7 +179,7 @@ def is_greeter_supported(self) -> bool:
def preview_text(self) -> Optional[str]:
"""
Used for preview text in profiles_bck. If a description is set for a
profile it will automatically display that one in the preivew.
profile it will automatically display that one in the preview.
If no preview or a different text should be displayed just
"""
if self.description:
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/disk/device_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def convert(

# not sure why we would ever wanna convert to percentages
if target_unit == Unit.Percent and total_size is None:
raise ValueError('Missing paramter total size to be able to convert to percentage')
raise ValueError('Missing parameter total size to be able to convert to percentage')

if self.unit == target_unit:
return self
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/disk/fido.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def get_fido2_devices(cls, reload: bool = False) -> List[Fido2Device]:
/dev/hidraw1 Yubico YubiKey OTP+FIDO+CCID
"""

# to prevent continous reloading which will slow
# to prevent continuous reloading which will slow
# down moving the cursor in the menu
if not cls._loaded or reload:
try:
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@


def generate_password(length :int = 64) -> str:
haystack = string.printable # digits, ascii_letters, punctiation (!"#$[] etc) and whitespace
haystack = string.printable # digits, ascii_letters, punctuation (!"#$[] etc) and whitespace
return ''.join(secrets.choice(haystack) for i in range(length))


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 @@ -15,7 +15,7 @@
from .profile.profile_menu import ProfileConfiguration
from .storage import storage
from .configuration import save_config
from .interactions import add_number_of_parrallel_downloads
from .interactions import add_number_of_parallel_downloads
from .interactions import ask_additional_packages_to_install
from .interactions import ask_for_additional_users
from .interactions import ask_for_audio_selection
Expand Down Expand Up @@ -119,7 +119,7 @@ def setup_selection_menu_options(self):
self._menu_options['parallel downloads'] = \
Selector(
_('Parallel Downloads'),
lambda preset: add_number_of_parrallel_downloads(preset),
lambda preset: add_number_of_parallel_downloads(preset),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we pass the method reference instead of a lambda?

Suggested change
lambda preset: add_number_of_parallel_downloads(preset),
add_number_of_parallel_downloads,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will the preset be preserved in the way we call the function at a later stage?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do it the same way with most other settings as well, I don't think it makes much difference

display_func=lambda x: x if x else '0',
default=0
)
Expand Down
10 changes: 5 additions & 5 deletions archinstall/lib/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def mount_ordered_layout(self):
for part_mod in sorted_part_mods:
if luks_handler := luks_handlers.get(part_mod):
# mount encrypted partition
self._mount_luks_partiton(part_mod, luks_handler)
self._mount_luks_partition(part_mod, luks_handler)
else:
# partition is not encrypted
self._mount_partition(part_mod)
Expand All @@ -219,7 +219,7 @@ def _mount_partition(self, part_mod: disk.PartitionModification):
if part_mod.fs_type == disk.FilesystemType.Btrfs and part_mod.dev_path:
self._mount_btrfs_subvol(part_mod.dev_path, part_mod.btrfs_subvols)

def _mount_luks_partiton(self, part_mod: disk.PartitionModification, luks_handler: Luks2):
def _mount_luks_partition(self, part_mod: disk.PartitionModification, luks_handler: Luks2):
# it would be none if it's btrfs as the subvolumes will have the mountpoints defined
if part_mod.mountpoint and luks_handler.mapper_dev:
target = self.target / part_mod.relative_mountpoint
Expand Down Expand Up @@ -315,7 +315,7 @@ def genfstab(self, flags :str = '-pU'):
raise RequirementError(f'Could not generate fstab, strapping in packages most likely failed (disk out of space?)\n Error: {err}')

if not gen_fstab:
raise RequirementError(f'Genrating fstab returned empty value')
raise RequirementError(f'Generating fstab returned empty value')

with open(fstab_path, 'a') as fp:
fp.write(gen_fstab)
Expand Down Expand Up @@ -434,7 +434,7 @@ def set_timezone(self, zone :str, *args :str, **kwargs :str) -> bool:

return False

def activate_time_syncronization(self) -> None:
def activate_time_synchronization(self) -> None:
info('Activating systemd-timesyncd for time synchronization using Arch Linux and ntp.org NTP servers')
self.enable_service('systemd-timesyncd')

Expand Down Expand Up @@ -1008,7 +1008,7 @@ def create_pacman_hook(contents: str):
Exec = /bin/sh -c \\"/usr/bin/limine bios-install /dev/disk/by-uuid/{root_uuid} && /usr/bin/cp /usr/share/limine/limine-bios.sys /boot/\\"
""")

# Limine does not ship with a default configuation file. We are going to
# Limine does not ship with a default configuration file. We are going to
# create a basic one that is similar to the one GRUB generates.
try:
config = f"""
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/interactions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from .general_conf import (
ask_ntp, ask_hostname, ask_for_a_timezone, ask_for_audio_selection,
select_archinstall_language, ask_additional_packages_to_install,
add_number_of_parrallel_downloads, select_additional_repositories
add_number_of_parallel_downloads, select_additional_repositories
)

from .system_conf import (
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/interactions/general_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def read_packages(p: List = []) -> list:
return packages


def add_number_of_parrallel_downloads(input_number :Optional[int] = None) -> Optional[int]:
def add_number_of_parallel_downloads(input_number :Optional[int] = None) -> Optional[int]:
max_recommended = 5
print(_(f"This option enables the number of parallel downloads that can occur during package downloads"))
print(_("Enter the number of parallel downloads to be enabled.\n\nNote:\n"))
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 @@ -80,7 +80,7 @@ def run(self) -> List[Any]:
self._data = self.handle_action(choice.value, None, self._data)
elif choice.value in self._terminate_actions:
break
else: # an entry of the existing selection was choosen
else: # an entry of the existing selection was chosen
selected_entry = data_formatted[choice.value] # type: ignore
self._run_actions_on_entry(selected_entry)

Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/menu/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def __init__(
:param allow_reset: This will explicitly handle a ctrl+c instead and return that specific state
:type allow_reset: bool

param allow_reset_warning_msg: If raise_error_on_interrupt is True the warnign is set, a user confirmation is displayed
param allow_reset_warning_msg: If raise_error_on_interrupt is True the warning is set, a user confirmation is displayed
type allow_reset_warning_msg: str

:param extra_bottom_space: Add an extra empty line at the end of the menu
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def _get_values(
) -> Dict[str, Any]:
"""
the original values returned a dataclass as dict thru the call to some specific methods
this version allows thru the parameter class_formatter to call a dynamicly selected formatting method.
this version allows thru the parameter class_formatter to call a dynamically selected formatting method.
Can transmit a filter list to the class_formatter,
"""
if class_formatter:
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/translationhandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def get_language_by_name(self, name: str) -> Language:

def get_language_by_abbr(self, abbr: str) -> Language:
"""
Get a language object by its abbrevation, e.g. en
Get a language object by its abbreviation, e.g. en
"""
try:
return next(filter(lambda x: x.abbr == abbr, self._translated_languages))
Expand Down
4 changes: 2 additions & 2 deletions archinstall/scripts/guided.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,15 @@ def perform_installation(mountpoint: Path):
installation.set_timezone(timezone)

if archinstall.arguments.get('ntp', False):
installation.activate_time_syncronization()
installation.activate_time_synchronization()

if archinstall.accessibility_tools_in_use():
installation.enable_espeakup()

if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
installation.user_set_pw('root', root_pw)

# This step must be after profile installs to allow profiles_bck to install language pre-requisits.
# This step must be after profile installs to allow profiles_bck to install language pre-requisites.
# After which, this step will set the language both for console and x11 if x11 was installed for instance.
installation.set_keyboard_language(locale_config.kb_layout)

Expand Down
6 changes: 3 additions & 3 deletions archinstall/scripts/swiss.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def setup_selection_menu_options(self):
super().setup_selection_menu_options()

self._menu_options['mode'] = menu.Selector(
'Excution mode',
'Execution mode',
lambda x : select_mode(),
display_func=lambda x: x.value if x else '',
default=ExecutionMode.Full)
Expand Down Expand Up @@ -249,15 +249,15 @@ def perform_installation(mountpoint: Path, exec_mode: ExecutionMode):
installation.set_timezone(timezone)

if archinstall.arguments.get('ntp', False):
installation.activate_time_syncronization()
installation.activate_time_synchronization()

if archinstall.accessibility_tools_in_use():
installation.enable_espeakup()

if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
installation.user_set_pw('root', root_pw)

# This step must be after profile installs to allow profiles_bck to install language pre-requisits.
# This step must be after profile installs to allow profiles_bck to install language pre-requisites.
# After which, this step will set the language both for console and x11 if x11 was installed for instance.
installation.set_keyboard_language(locale_config.kb_layout)

Expand Down
4 changes: 2 additions & 2 deletions examples/interactive_installation.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,15 @@ def perform_installation(mountpoint: Path):
installation.set_timezone(timezone)

if archinstall.arguments.get('ntp', False):
installation.activate_time_syncronization()
installation.activate_time_synchronization()

if archinstall.accessibility_tools_in_use():
installation.enable_espeakup()

if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
installation.user_set_pw('root', root_pw)

# This step must be after profile installs to allow profiles_bck to install language pre-requisits.
# This step must be after profile installs to allow profiles_bck to install language pre-requisites.
# After which, this step will set the language both for console and x11 if x11 was installed for instance.
installation.set_keyboard_language(locale_config.kb_layout)

Expand Down