diff options
| author | Adriaan de Groot <groot@kde.org> | 2019-05-10 15:28:37 -0400 |
|---|---|---|
| committer | Adriaan de Groot <groot@kde.org> | 2019-05-10 15:28:37 -0400 |
| commit | 9bf1d83c2f58f24cbaef3a6820fbe3b79f3246f8 (patch) | |
| tree | 596fbf83f8cc3d6990299ed3d4674c8fcc13bd82 | |
| parent | 5b8a54edce69897195322bbc129bbaa5da0d9337 (diff) | |
[bootloader] Centralize the filename sanitizer
- Centralize the sanitizer so that it's consistent in different
environments.
- While here, add () to the sanitizer to avoid some distro's with
parenthesized names from creating weird EFI dirs.
| -rw-r--r-- | src/modules/bootloader/main.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 4a0bef326..2c384ca30 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -43,6 +43,9 @@ _ = gettext.translation("calamares-python", languages=libcalamares.utils.gettext_languages(), fallback=True).gettext +# This is the sanitizer used all over to tidy up filenames +# to make identifiers (or to clean up names to make filenames). +file_name_sanitizer = str.maketrans(" /()", "_-__") def pretty_name(): return _("Install bootloader.") @@ -211,7 +214,6 @@ def efi_label(): branding = libcalamares.globalstorage.value("branding") efi_bootloader_id = branding["bootloaderEntryName"] - file_name_sanitizer = str.maketrans(" /", "_-") return efi_bootloader_id.translate(file_name_sanitizer) @@ -238,7 +240,6 @@ def install_systemd_boot(efi_directory): install_efi_directory = install_path + efi_directory uuid = get_uuid() distribution = get_bootloader_entry_name() - file_name_sanitizer = str.maketrans(" /", "_-") distribution_translated = distribution.translate(file_name_sanitizer) loader_path = os.path.join(install_efi_directory, "loader", |