mirror of
https://github.com/Llewellynvdm/Tomb.git
synced 2025-02-02 11:58:28 +00:00
[cleanup] Fix log of commands by using arrays consistently
This commit is contained in:
parent
b721de0ec1
commit
da183aa689
19
tomb
19
tomb
@ -42,9 +42,13 @@ DATE="Sept/2014"
|
|||||||
TOMBEXEC=$0
|
TOMBEXEC=$0
|
||||||
typeset -a OLDARGS
|
typeset -a OLDARGS
|
||||||
for arg in ${argv}; do OLDARGS+=($arg); done
|
for arg in ${argv}; do OLDARGS+=($arg); done
|
||||||
DD="dd"
|
|
||||||
WIPE="rm -f"
|
# Special command requirements
|
||||||
MKFS="mkfs.ext3 -q -F -j -L"
|
typeset -a DD WIPE MKFS
|
||||||
|
DD=(dd)
|
||||||
|
WIPE=(rm -f)
|
||||||
|
MKFS=(mkfs.ext3 -q -F -j -L)
|
||||||
|
|
||||||
KDF=1
|
KDF=1
|
||||||
STEGHIDE=1
|
STEGHIDE=1
|
||||||
RESIZER=1
|
RESIZER=1
|
||||||
@ -576,16 +580,13 @@ check_bin() {
|
|||||||
export PATH=/sbin:/usr/sbin:$PATH
|
export PATH=/sbin:/usr/sbin:$PATH
|
||||||
|
|
||||||
# which dd command to use
|
# which dd command to use
|
||||||
command -v dcfldd >& -
|
command -v dcfldd >& - && DD=(dcfldd statusinterval=1)
|
||||||
{ test $? = 0 } && { DD="dcfldd statusinterval=1" }
|
|
||||||
|
|
||||||
# which wipe command to use
|
# which wipe command to use
|
||||||
command -v wipe >& - && WIPE="wipe -f -s" || WIPE="rm -f"
|
command -v wipe >& - && WIPE=(wipe -f -s)
|
||||||
|
|
||||||
# check for filesystem creation progs
|
# check for filesystem creation progs
|
||||||
command -v mkfs.ext4 >& - && \
|
command -v mkfs.ext4 >& - && MKFS=(mkfs.ext4 -q -F -j -L)
|
||||||
MKFS="mkfs.ext4 -q -F -j -L" || \
|
|
||||||
MKFS="mkfs.ext3 -q -F -j -L"
|
|
||||||
|
|
||||||
# check for steghide
|
# check for steghide
|
||||||
command -v steghide >& - || STEGHIDE=0
|
command -v steghide >& - || STEGHIDE=0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user