Merge pull request #206 from timhae/feature/remove-trailing-newlines-…

…from-keys feat: remove empty newlines from jq query
ryantm · Oct 8, 2023 · e2f3392 · e2f3392
2 parents 1f677b3 + b5fa96a
commit e2f3392
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkgs/agenix.sh b/pkgs/agenix.sh
@@ -115,7 +115,7 @@ function cleanup {
 trap "cleanup" 0 2 3 15
 
 function keys {
-    (@nixInstantiate@ --json --eval --strict -E "(let rules = import $RULES; in rules.\"$FILE\".publicKeys)" | @jqBin@ -r .[]) || exit 1
+    (@nixInstantiate@ --json --eval --strict -E "(let rules = import $RULES; in rules.\"$FILE\".publicKeys)" | @jqBin@ -r 'map(rtrimstr("\n")) .[]') || exit 1
 }
 
 function decrypt {
@@ -185,7 +185,7 @@ function edit {
 }
 
 function rekey {
-    FILES=$( (@nixInstantiate@ --json --eval -E "(let rules = import $RULES; in builtins.attrNames rules)"  | @jqBin@ -r .[]) || exit 1)
+    FILES=$( (@nixInstantiate@ --json --eval -E "(let rules = import $RULES; in builtins.attrNames rules)"  | @jqBin@ -r 'map(rtrimstr("\n")) .[]') || exit 1)
 
     for FILE in $FILES
     do