Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2025-03-21 02:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix to exhume key (steg) to correctly print on stdout when -k -

Browse Source 
addressing issue #118
This commit is contained in:
Jaromil 2014-08-03 19:54:43 +02:00
parent f06f303491
commit b7e89e5246
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tomb
View File

@ -942,7 +942,10 @@ bury_key() {
} }
exhume_key() { exhume_key() {
tombkey="`option_value -k`" tombkey="`option_value -k`"
{ test "$tombkey" = "" } && { tombkey=stdout } { test "$tombkey" = "" } && {
tombkey="-"
_message "printing exhumed key on stdout"
}
imagefile="$1" imagefile="$1"
res=1 res=1
@ -952,14 +955,16 @@ exhume_key() {
_failure "Encode failed: $imagefile is not a jpeg image." _failure "Encode failed: $imagefile is not a jpeg image."
fi fi
if [[ -e "$tombkey" ]]; then { test "$tombkey" = "-" } || {
_warning "File exists: $tombkey" if [[ -e "$tombkey" ]]; then
{ option_is_set -f } || { _warning "File exists: $tombkey"
_warning "Make explicit use of --force to overwrite." { option_is_set -f } || {
_failure "Refusing to overwrite file. Operation aborted." } _warning "Make explicit use of --force to overwrite."
_warning "Use of --force selected: overwriting." _failure "Refusing to overwrite file. Operation aborted." }
rm -f ${tombkey} _warning "Use of --force selected: overwriting."
fi rm -f ${tombkey}
fi
}
_message "Trying to exhume a key out of image $imagefile" _message "Trying to exhume a key out of image $imagefile"
if option_is_set --tomb-pwd; then if option_is_set --tomb-pwd; then