=== modified file 'bin/confz' --- bin/confz 2014-06-19 16:38:26 +0000 +++ bin/confz 2014-06-19 16:32:25 +0000 @@ -14,13 +14,13 @@ print -r - ${(p)confz_err_mark} "$@" >&2 exit 1 } -confz_err_mark="%F{red}*%f" +confz_err_mark="%F[red]*%f" # trace-printing helpers -confz_exe_mark="%F{yellow}*%f" +confz_exe_mark="%F[yellow]*%f" confz_check_start() { - print -Pn "${confz_indent}checking %B$1%b " + print -Pn "${indent}checking %B$1%b " print -rn - ${(@q)argv[2,-1]} print -P " [" confz_indent+=" " @@ -28,16 +28,16 @@ confz_check_ok() { confz_indent=${confz_indent% } - print -P "$confz_indent] %F{green}$1%f OK" + print -P "$indent] %F[green]$1%f OK" } confz_check_fail() { confz_indent=${confz_indent% } - print -P "$indent] %F{yellow}$1%f FAIL" + print -P "$indent] %F[yellow]$1%f FAIL" } confz_do() { - print -r - $confz_indent${(p)confz_exe_mark} "${(q)@}" + print -r - $indent${(p)confz_exe_mark} "${(q)@}" "$@" || die "command failed with error $?: ${(q)@}" } === modified file 'zsh-functions/confz_vserver_init' --- zsh-functions/confz_vserver_init 2014-06-19 16:38:26 +0000 +++ zsh-functions/confz_vserver_init 2014-06-19 15:00:04 +0000 @@ -59,8 +59,7 @@ fi [[ -h ${vars[etcdir]}/vdir ]] || ret=1 - require mounted_volume :size :filesystem \ - lv_name=${vars[name]} mountpoint=${vars[vdir]} + require mounted_volume :name :size :filesystem mountpoint=${vars[vdir]} require deployed_system :source path=${vars[vdir]} return $ret