ttomb list now output also size and usage information - tomb - the crypto undertaker (HTM) git clone git://parazyd.org/tomb.git (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 2c26903206b11fdfd2ca3247930e6e0dca24166a (DIR) parent 3baa72b5a5c541f76174c60806d02a0bdf5cac81 (HTM) Author: Jaromil <jaromil@dyne.org> Date: Thu, 26 May 2011 12:24:17 +0200 ttomb list now output also size and usage information Diffstat: M src/tomb | 35 ++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) --- (DIR) diff --git a/src/tomb b/src/tomb t@@ -34,10 +34,17 @@ autoload colors; colors # standard output message routines # it's always useful to wrap them, in case we change behaviour later notice() { if ! [ $QUIET ]; then print "$fg_bold[green][*]$fg_no_bold[white] $1" >&2; fi } -act() { if ! [ $QUIET ]; then print "$fg_bold[white] . $fg_no_bold[white] $1" >&2; fi } error() { if ! [ $QUIET ]; then print "$fg[red][!]$fg[white] $1" >&2; fi } func() { if [ $DEBUG ]; then print "$fg[blue][D]$fg[white] $1" >&2; fi } - +act() { + if ! [ $QUIET ]; then + if [ "$1" = "-n" ]; then + print -n "$fg_bold[white] . $fg_no_bold[white] $2" >&2; + else + print "$fg_bold[white] . $fg_no_bold[white] $1" >&2; + fi + fi +} check_bin() { # which dd command to use t@@ -886,13 +893,34 @@ list_tombs() { tombfs=${t[(ws:;:)3]} tombfsopts=${t[(ws:;:)4]} + # calculate tomb size + ts=`df -hP /dev/mapper/$mapper | + awk "/mapper/"' { print $2 ";" $3 ";" $4 ";" $5 }'` + tombtot=${ts[(ws:;:)1]} + tombused=${ts[(ws:;:)2]} + tombavail=${ts[(ws:;:)3]} + tombpercent=${ts[(ws:;:)4]} + tombsince=`date --date=@${mapper[(ws:.:)3]} +%c` + # breaking up such strings is good for translation print -n "$fg[green]$tombname" print -n "$fg[white] open on " print -n "$fg_bold[white]$tombmount" print -n "$fg_no_bold[white] using " print "$fg_bold[white]$tombfs $tombfsopts" + + print -n "$fg_no_bold[green]$tombname" + print -n "$fg[white] size " + print -n "$fg_bold[white]$tombtot" + print -n "$fg_no_bold[white] of which " + print -n "$fg_bold[white]$tombused" + print -n "$fg_no_bold[white] used " + print -n "$fg_bold[white]$tombavail" + print -n "$fg_no_bold[white] free (" + print -n "$fg_bold[white]$tombpercent" + print "$fg_no_bold[white] full)" + print -n "$fg_no_bold[green]$tombname" print -n "$fg_no_bold[white] open since " print "$fg_bold[white]$tombsince$fg_no_bold[white]" t@@ -1064,9 +1092,10 @@ main () { return 1 fi decode_key ${CMD2} ;; + # internal commands useful to developers + 'source') return 0 ;; install) check_priv ; install_tomb ;; askpass) ask_password $CMD2 ;; - status) tomb-status ;; mktemp) safe_dir ${CMD2} ;; translate) generate_translatable_strings ;; *) error "command \"$CMD\" not recognized"