Use jq instead of sed

ryantm · Feb 17, 2023 · 50b04a9 · 50b04a9
1 parent de65706
commit 50b04a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkgs/agenix.nix b/pkgs/agenix.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   rage,
-  gnused,
+  jq,
   nix,
   mktemp,
   diffutils,
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "0.13.0";
   src = substituteAll {
     inherit ageBin version;
-    sedBin = "${gnused}/bin/sed";
+    jqBin = "${jq}/bin/jq";
     nixInstantiate = "${nix}/bin/nix-instantiate";
     mktempBin = "${mktemp}/bin/mktemp";
     diffBin = "${diffutils}/bin/diff";

diff --git a/pkgs/agenix.sh b/pkgs/agenix.sh
@@ -93,7 +93,7 @@ trap "cleanup" 0 2 3 15
 
 function edit {
     FILE=$1
-    KEYS=$( (@nixInstantiate@ --eval -E "(let rules = import $RULES; in builtins.concatStringsSep \"\n\" rules.\"$FILE\".publicKeys)" | @sedBin@ 's/"//g' | @sedBin@ 's/\\n/\n/g') | @sedBin@ '/^$/d' || exit 1)
+    KEYS=$( (@nixInstantiate@ --json --eval -E "(let rules = import $RULES; in builtins.concatStringsSep \"\n\" rules.\"$FILE\".publicKeys)" | @jqBin@ -r .[]) || exit 1)
 
     if [ -z "$KEYS" ]
     then
@@ -148,7 +148,7 @@ function edit {
 }
 
 function rekey {
-    FILES=$( (@nixInstantiate@ --eval -E "(let rules = import $RULES; in builtins.concatStringsSep \"\n\" (builtins.attrNames rules))"  | @sedBin@ 's/"//g' | @sedBin@ 's/\\n/\n/g') || exit 1)
+    FILES=$( (@nixInstantiate@ --json --eval -E "(let rules = import $RULES; in builtins.concatStringsSep \"\n\" (builtins.attrNames rules))"  | @jqBin@ -r .[]) || exit 1)
 
     for FILE in $FILES
     do