From 29d91a4fbf1f02728af29dfbea40f938979c8665 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Jun 2017 16:18:26 +0600 Subject: [PATCH] Python-style: refactor calculating target path of hook-script --- src/modules/initramfscfg/main.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/modules/initramfscfg/main.py b/src/modules/initramfscfg/main.py index 21dcaee9d..3f77ccd6d 100644 --- a/src/modules/initramfscfg/main.py +++ b/src/modules/initramfscfg/main.py @@ -46,21 +46,19 @@ def copy_initramfs_hooks(partitions, root_mount_point): unencrypted_separate_boot = True if encrypt_hook: + target = "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format( + root_mount_point) if unencrypted_separate_boot: shutil.copy2( "/usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey", - "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format( - root_mount_point) - ) + target + ) else: shutil.copy2( "/usr/lib/calamares/modules/initramfscfg/encrypt_hook", - "{!s}/usr/share/initramfs-tools/hooks/".format( - root_mount_point) - ) - os.chmod("{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format( - root_mount_point), 0o755 - ) + target + ) + os.chmod(target, 0o755) def run():