Merge pull request #290 from parazyd/use-shred-instead-wipe-patch

use shred instead of wipe
This commit is contained in:
Jaromil 2018-01-03 10:03:50 +01:00 committed by GitHub
commit 9b1d1891cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@ all:
@echo "To install it in /usr/local together with its manpage use 'make install'." @echo "To install it in /usr/local together with its manpage use 'make install'."
@echo @echo
@echo "To run Tomb one needs to have some tools installed on the system:" @echo "To run Tomb one needs to have some tools installed on the system:"
@echo "Sudo, cryptsetup, pinentry and gnupg. Also wipe is recommended." @echo "Sudo, cryptsetup, pinentry and gnupg."
@echo @echo
install: install:

4
tomb
View File

@ -781,7 +781,7 @@ function _print() {
_list_optional_tools() { _list_optional_tools() {
typeset -a _deps typeset -a _deps
_deps=(gettext dcfldd wipe steghide) _deps=(gettext dcfldd shred steghide)
_deps+=(resize2fs tomb-kdb-pbkdf2 qrencode swish-e unoconv lsof) _deps+=(resize2fs tomb-kdb-pbkdf2 qrencode swish-e unoconv lsof)
for d in $_deps; do for d in $_deps; do
_print "`which $d`" _print "`which $d`"
@ -811,7 +811,7 @@ _ensure_dependencies() {
command -v dcfldd 1>/dev/null 2>/dev/null && DD=(dcfldd statusinterval=1) command -v dcfldd 1>/dev/null 2>/dev/null && DD=(dcfldd statusinterval=1)
# Which wipe command to use # Which wipe command to use
command -v wipe 1>/dev/null 2>/dev/null && WIPE=(wipe -f -s) command -v shred 1>/dev/null 2>/dev/null && WIPE=(shred -f -u)
# Check for lsof for slamming tombs # Check for lsof for slamming tombs
command -v lsof 1>/dev/null 2>/dev/null || LSOF=0 command -v lsof 1>/dev/null 2>/dev/null || LSOF=0