mynix/agenix
1
0
Fork 0
mirror of https://github.com/ryantm/agenix.git synced 2024-11-22 17:50:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #51 from michaeladler/fix/diff-command-not-found

Browse source 
Make 'diff' an explicit dependency
This commit is contained in:
Ryan Mulligan 2021-07-22 06:27:35 -07:00 committed by GitHub
commit fb00f178b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/agenix.nix
View file

@ -7,6 +7,7 @@
gnused, gnused,
nix, nix,
mktemp, mktemp,
diffutils,
} : } :
let let
# we need at least rage 0.5.0 to support ssh keys # we need at least rage 0.5.0 to support ssh keys
@ -17,6 +18,7 @@ let
sedBin = "${gnused}/bin/sed"; sedBin = "${gnused}/bin/sed";
nixInstantiate = "${nix}/bin/nix-instantiate"; nixInstantiate = "${nix}/bin/nix-instantiate";
mktempBin = "${mktemp}/bin/mktemp"; mktempBin = "${mktemp}/bin/mktemp";
diffBin = "${diffutils}/bin/diff";
in in
lib.recursiveUpdate (writeShellScriptBin "agenix" '' lib.recursiveUpdate (writeShellScriptBin "agenix" ''
set -Eeuo pipefail set -Eeuo pipefail
@ -147,7 +149,7 @@ function edit {
echo "$FILE wasn't created." echo "$FILE wasn't created."
return return
fi fi
[ -f "$FILE" ] && [ "$EDITOR" != ":" ] && diff "$CLEARTEXT_FILE.before" "$CLEARTEXT_FILE" 1>/dev/null && echo "$FILE wasn't changed, skipping re-encryption." && return [ -f "$FILE" ] && [ "$EDITOR" != ":" ] && ${diffBin} "$CLEARTEXT_FILE.before" "$CLEARTEXT_FILE" 1>/dev/null && echo "$FILE wasn't changed, skipping re-encryption." && return
ENCRYPT=() ENCRYPT=()
while IFS= read -r key while IFS= read -r key