Compare commits

...

2 Commits

Author SHA1 Message Date
Zeke Dou bf579344ad
Merge 2c9abfec86 into 1381a759b2 2024-04-02 23:53:01 -05:00
c4710n 2c9abfec86
Improve keys function for keys with extra newlines 2024-03-15 11:55:12 +08:00
2 changed files with 3 additions and 1 deletions

View File

@ -3,6 +3,7 @@
stdenv,
age,
jq,
gnused,
nix,
mktemp,
diffutils,
@ -18,6 +19,7 @@ in
src = substituteAll {
inherit ageBin version;
jqBin = "${jq}/bin/jq";
sedBin = "${gnused}/bin/sed";
nixInstantiate = "${nix}/bin/nix-instantiate";
mktempBin = "${mktemp}/bin/mktemp";
diffBin = "${diffutils}/bin/diff";

View File

@ -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.\"$1\".publicKeys)" | @jqBin@ -r .[]) || exit 1
(@nixInstantiate@ --json --eval --strict -E "(let rules = import $RULES; in rules.\"$1\".publicKeys)" | @jqBin@ -r .[] | @sedBin@ '/^$/d') || exit 1
}
function decrypt {