Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pkgs/agenix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,19 @@ function edit {

[ ! -f "$CLEARTEXT_FILE" ] || cp -- "$CLEARTEXT_FILE" "$CLEARTEXT_FILE.before"

[ -t 0 ] || EDITOR='cp -- /dev/stdin'
# only edit if we're not rekeying
if [ "${EDITOR:-}" != ":" ]; then
[ -t 0 ] || EDITOR='cp -- /dev/stdin'

$EDITOR "$CLEARTEXT_FILE"
$EDITOR "$CLEARTEXT_FILE"
fi

if [ ! -f "$CLEARTEXT_FILE" ]
then
warn "$FILE wasn't created."
return
fi
[ -f "$FILE" ] && [ "$EDITOR" != ":" ] && @diffBin@ -q -- "$CLEARTEXT_FILE.before" "$CLEARTEXT_FILE" && warn "$FILE wasn't changed, skipping re-encryption." && return
[ -f "$FILE" ] && [ "${EDITOR:-}" != ":" ] && @diffBin@ -q -- "$CLEARTEXT_FILE.before" "$CLEARTEXT_FILE" && warn "$FILE wasn't changed, skipping re-encryption." && return

ENCRYPT=()
if [[ "$ARMOR" == "true" ]]; then
Expand Down
Loading