DGNum/agenix
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #148 from n8henrie/sed_vs_jq

Browse source 
contrib: use jq instead of sed
This commit is contained in:
Ryan Mulligan 2023-09-21 16:33:52 -07:00 committed by GitHub
commit 7f9dfa309f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/agenix.nix
View file

@ -2,7 +2,7 @@
lib, lib,
stdenv, stdenv,
rage, rage,
gnused, jq,
nix, nix,
mktemp, mktemp,
diffutils, diffutils,
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
version = "0.14.0"; version = "0.14.0";
src = substituteAll { src = substituteAll {
inherit ageBin version; inherit ageBin version;
sedBin = "${gnused}/bin/sed"; jqBin = "${jq}/bin/jq";
nixInstantiate = "${nix}/bin/nix-instantiate"; nixInstantiate = "${nix}/bin/nix-instantiate";
mktempBin = "${mktemp}/bin/mktemp"; mktempBin = "${mktemp}/bin/mktemp";
diffBin = "${diffutils}/bin/diff"; diffBin = "${diffutils}/bin/diff";

4
pkgs/agenix.sh
View file

@ -115,7 +115,7 @@ function cleanup {
trap "cleanup" 0 2 3 15 trap "cleanup" 0 2 3 15
function keys { 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 { function decrypt {
@ -185,7 +185,7 @@ function edit {
} }
function rekey { 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 for FILE in $FILES
do do