Use for loop instead of formatlist()

ddterm · Feb 4, 2025 · bee69f7 · bee69f7
1 parent aaf1e44
commit bee69f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/fedora.ks b/fedora.ks
@@ -8,7 +8,9 @@ bootloader --location=mbr
 firstboot --disable
 autopart
 user --name=vagrant --groups=wheel --password=vagrant --plaintext
-${join("\n", formatlist("sshkey --username=vagrant \"%s\"", compact(split("\n", file("${path.root}/keys/vagrant.pub")))))}
+%{ for key in compact(split("\n", file("${path.root}/keys/vagrant.pub"))) ~}
+sshkey --username=vagrant ${jsonencode(key)}
+%{ endfor ~}
 reboot
 
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch

diff --git a/nix/configuration.nix b/nix/configuration.nix
@@ -49,7 +49,9 @@
     packages = with pkgs; [
     ];
     openssh.authorizedKeys.keys = [
-      ${join("\n", formatlist("\"%s\"", compact(split("\n", file("${path.root}/keys/vagrant.pub")))))}
+      %{ for key in compact(split("\n", file("${path.root}/keys/vagrant.pub"))) ~}
+      ${jsonencode(key)}
+      %{ endfor ~}
     ];
   };
 

diff --git a/silverblue.ks b/silverblue.ks
@@ -8,7 +8,9 @@ bootloader --location=mbr
 firstboot --disable
 autopart
 user --name=vagrant --groups=wheel --password=vagrant --plaintext
-${join("\n", formatlist("sshkey --username=vagrant \"%s\"", compact(split("\n", file("${path.root}/keys/vagrant.pub")))))}
+%{ for key in compact(split("\n", file("${path.root}/keys/vagrant.pub"))) ~}
+sshkey --username=vagrant ${jsonencode(key)}
+%{ endfor ~}
 ostreesetup --osname="fedora-silverblue" --remote="fedora" --url="file:///ostree/repo" --ref="fedora/${version}/x86_64/silverblue" --nogpg
 reboot