From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 14 Dec 2018 12:22:30 +0000 (+0100)
Subject: Use single quotes type instead of escaping
X-Git-Tag: v5~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F306%2Fhead;p=thirdparty%2Fmkosi.git

Use single quotes type instead of escaping

That's just more readable and shorter.
---

diff --git a/mkosi b/mkosi
index 06a9a819e..d0d858123 100755
--- a/mkosi
+++ b/mkosi
@@ -1807,9 +1807,9 @@ SigLevel    = Required DatabaseOptional
         def jj(line: str) -> str:
             if line.startswith("HOOKS="):
                 if args.encrypt == "all":
-                    return "HOOKS=\"systemd modconf block sd-encrypt filesystems keyboard fsck\"\n"
+                    return 'HOOKS="systemd modconf block sd-encrypt filesystems keyboard fsck"\n'
                 else:
-                    return "HOOKS=\"systemd modconf block filesystems fsck\"\n"
+                    return 'HOOKS="systemd modconf block filesystems fsck"\n'
             return line
         patch_file(os.path.join(workspace, "root", "etc/mkinitcpio.conf"), jj)
 
@@ -2071,7 +2071,7 @@ def install_grub(args: CommandLineArguments, workspace: str, loopdev: str, grub:
     if args.bios_partno is None:
         return
 
-    grub_cmdline = f"GRUB_CMDLINE_LINUX=\"{args.kernel_commandline}\"\n"
+    grub_cmdline = f'GRUB_CMDLINE_LINUX="{args.kernel_commandline}"\n'
     os.makedirs(os.path.join(workspace, "root", "etc/default"), exist_ok=True, mode=0o755)
     if not os.path.exists(os.path.join(workspace, "root", "etc/default/grub")):
         with open(os.path.join(workspace, "root", "etc/default/grub"), "w+") as f: