fix: enable running rekey in a non-interactive shell (#362)
* fix: enable running rekey in a non-interactive shell * chore: rerun CI --------- Co-authored-by: Slavek Kabrda <slavek.kabrda@loftorbital.com>
This commit is contained in:
parent
fcdea22339
commit
b027ee29d9
1 changed files with 6 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue