Skip to content

Commit

Permalink
Merge pull request #148 from n8henrie/sed_vs_jq
Browse files Browse the repository at this point in the history
contrib: use jq instead of sed
  • Loading branch information
ryantm authored Sep 21, 2023
2 parents 572baca + da763b2 commit 7f9dfa3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pkgs/agenix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
lib,
stdenv,
rage,
gnused,
jq,
nix,
mktemp,
diffutils,
Expand All @@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
version = "0.14.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";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/agenix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function cleanup {
trap "cleanup" 0 2 3 15

function keys {
(@nixInstantiate@ --eval -E "(let rules = import $RULES; in builtins.concatStringsSep \"\n\" rules.\"$1\".publicKeys)" | @sedBin@ 's/"//g' | @sedBin@ 's/\\n/\n/g') | @sedBin@ '/^$/d' || exit 1
(@nixInstantiate@ --json --eval -E "(let rules = import $RULES; in rules.\"$FILE\".publicKeys)" | @jqBin@ -r .[]) || exit 1
}

function decrypt {
Expand Down Expand Up @@ -185,7 +185,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.attrNames rules)" | @jqBin@ -r .[]) || exit 1)

for FILE in $FILES
do
Expand Down

0 comments on commit 7f9dfa3

Please sign in to comment.