small fix to whitespace and leftover newline tests

This commit is contained in:
Jaromil 2014-11-21 22:32:38 +01:00
parent e48c7c4a85
commit 4d82b20199

6
tomb
View File

@ -846,12 +846,12 @@ _load_key() {
fi fi
_verbose "load_key: ::1 key::" $TOMBKEYFILE _verbose "load_key: ::1 key::" $TOMBKEYFILE
is_valid_key $TOMBKEY || { is_valid_key $TOMBKEY || {
_warning "The key seems invalid or its format is not known by this version of Tomb." _warning "The key seems invalid or its format is not known by this version of Tomb."
_tomb_key_recover $TOMBKEY _tomb_key_recover $TOMBKEY
} }
# Declared TOMBKEYFILE (path) # Declared TOMBKEYFILE (path)
# Declared TOMBKEY (contents) # Declared TOMBKEY (contents)
@ -997,7 +997,7 @@ ask_key_password() {
# call cryptsetup with arguments using the currently known secret # call cryptsetup with arguments using the currently known secret
# echo flags eliminate newline and disable escape (BSD_ECHO) # echo flags eliminate newline and disable escape (BSD_ECHO)
_cryptsetup() { _cryptsetup() {
print -R - "$TOMBSECRET" | cryptsetup --key-file - ${=@} print -R -n - "$TOMBSECRET" | cryptsetup --key-file - ${=@}
return $? return $?
} }